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

projects/mesxc-dy #328

Merged
juzi merged 2 commits from projects/mesxc-dy into projects/mesxc-test 2024-04-11 16:55:04 +08:00
Conversation 0 Commits 2 Files Changed 32 +284 -219
32 changed files with 284 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63a753d7d6 - Show all commits

2
src/views/base/coreCustomer/index.vue
View File

@ -138,7 +138,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-customer:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',

2
src/views/base/coreDepartment/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-department:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',

8
src/views/base/coreEquipment/index.vue
View File

@ -156,11 +156,11 @@ export default {
prop: 'createTime',
label: '添加时间',
fixed: true,
width: 180,
minWidth: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
{ width: 250, prop: 'code', label: '设备编码' },
{ prop: 'name', label: '设备名称', minWidth: 180, showOverflowtooltip: true },
{ minWidth: 250, prop: 'code', label: '设备编码' },
{ prop: 'equipmentTypeName', label: '设备类型' },
{ prop: 'enName', label: '英文名称' },
{ prop: 'abbr', label: '缩写' },
@ -211,7 +211,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('base:core-equipment:export') || this.$auth.hasPermi('base:core-equipment:create')) ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-equipment:export')

3
src/views/base/coreEquipmentLineBind/index.vue
View File

@ -126,7 +126,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-equipment-bind-section:create')

5
src/views/base/coreEquipmentType/index.vue
View File

@ -90,7 +90,7 @@ export default {
prop: 'createTime',
label: '添加时间',
fixed: true,
width: 180,
minWidth: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'name', label: '类型名称' },
@ -111,7 +111,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-equipment-type:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-equipment-type:create')

2
src/views/base/coreHotMaterial/index.vue
View File

@ -137,7 +137,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'button' : '',

2
src/views/base/coreMajor/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-major:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',

18
src/views/base/coreProduct/index.vue
View File

@ -14,7 +14,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:Width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@ -48,45 +48,45 @@ const tableProps = [
prop: 'createTime',
label: '添加时间',
filter: parseTime,
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'name',
label: '产品名称',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'code',
label: '产品编码',
width: 190,
minWidth: 190,
showOverflowtooltip: true
},
{
prop: 'productType',
label: '产品类型',
filter: publicFormatter('product_type'),
width: 180,
minWidth: 180,
showOverflowtooltip: true
},
{
prop: 'specifications',
label: '规格',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('unit_dict'),
width: 90,
minWidth: 90,
showOverflowtooltip: true
},
{
prop: 'remark',
label: '备注',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
];
@ -141,7 +141,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-product:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '',

22
src/views/base/coreProductionLine/index.vue
View File

@ -14,7 +14,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:minWidth="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@ -30,7 +30,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="50%">
minWidth="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>
@ -56,39 +56,39 @@ const tableProps = [
prop: 'createTime',
label: '添加时间',
filter: parseTime,
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'factoryName',
label: '工厂',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'roomNameDict',
label: '车间名称',
filter: publicFormatter('workshop'),
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'name',
label: '产线名称',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'code',
label: '产线编码',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'enabled',
label: '当前状态',
filter: codeFilter('lineStatus'),
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
// {
@ -98,13 +98,13 @@ const tableProps = [
{
prop: 'description',
label: '描述',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'remark',
label: '备注',
width: 120,
minWidth: 120,
showOverflowtooltip: true
}
];
@ -147,7 +147,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '',

2
src/views/base/coreSupplier/index.vue
View File

@ -132,7 +132,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-supplier:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-04-08 14:27:29
* @LastEditTime: 2024-04-10 16:16:31
* @Description:
-->
<template>
@ -201,24 +201,26 @@
@pagination="getList" /> -->
</div>
<div class="card" style="padding-bottom: 16px;">
<div class="boxTitle">
<span class="blueTitle"></span>
<span>预计用料信息</span>
<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>
<span>预计用料信息</span>
</div>
<base-table
:table-props="tableProps1"
:page="listQuery1.pageNo"
:limit="listQuery1.pageSize"
:table-data="materialList"
:max-height="tableH" />
<!-- <pagination
v-show="listQuery1.total > 0"
:total="listQuery1.total"
:page.sync="listQuery1.pageNo"
:limit.sync="listQuery1.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList" /> -->
</div>
<base-table
:table-props="tableProps1"
:page="listQuery1.pageNo"
:limit="listQuery1.pageSize"
:table-data="materialList"
:max-height="tableH" />
<!-- <pagination
v-show="listQuery1.total > 0"
:total="listQuery1.total"
:page.sync="listQuery1.pageNo"
:limit.sync="listQuery1.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList" /> -->
</div>
<!-- <div class="drawer-body__footer">
@ -461,7 +463,7 @@ export default {
});
// 获取预使用原料列表
console.log('111我看看', this.dataForm.materialMethod)
if (this.dataForm.id) {
if (this.dataForm.id && this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])) {
if (this.dataForm.materialMethod === 1) {
// 产品
getlistByProductId({

175
src/views/base/coreWorkOrder/index.vue
View File

@ -157,92 +157,105 @@ export default {
// showTip: '预使用原料信息'
// }
// : undefined,
{
type: 'active',
btnName: '激活',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 1
},
{
name: 'status',
type: 'equal',
value: 3
}
]
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'active',
btnName: '激活',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 1
},
{
name: 'status',
type: 'equal',
value: 3
}
]
}
}
},
{
type: 'pause',
btnName: '暂停',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
}
]
: undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'pause',
btnName: '暂停',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
}
]
}
}
},
{
type: 'nullify',
btnName: '作废',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 1
}
]
: undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'nullify',
btnName: '作废',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 1
}
]
}
}
},
{
type: 'finish',
btnName: '完成',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
},
{
name: 'status',
type: 'equal',
value: 3
}
]
: undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'finish',
btnName: '完成',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
},
{
name: 'status',
type: 'equal',
value: 3
}
]
}
}
},
{
type: 'stop',
btnName: '终止',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
},
{
name: 'status',
type: 'equal',
value: 3
}
]
: undefined,
this.$auth.hasPermi(`base:core-work-order:update`)
? {
type: 'stop',
btnName: '终止',
showParam: {
type: '|',
data: [
{
name: 'status',
type: 'equal',
value: 2
},
{
name: 'status',
type: 'equal',
value: 3
}
]
}
}
},
this.$auth.hasPermi(`base:core-work-order:detail`)
: undefined,
this.$auth.hasPermiAnd([
'base:core-work-order:query',
'base:order:query'
])
? {
type: 'detail',
btnName: '查看详情',

2
src/views/base/coreWorker/index.vue
View File

@ -163,7 +163,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-worker:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '',

5
src/views/base/coreWorkshopSection/index.vue
View File

@ -52,8 +52,7 @@ const tableProps = [
{
prop: 'createTime',
label: '添加时间',
filter: parseTime,
filter: parseTime
},
{
prop: 'code',
@ -116,7 +115,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '',

51
src/views/base/material/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-21 15:21:32
* @LastEditTime: 2024-04-11 16:22:19
* @Description:
-->
<template>
@ -122,14 +122,14 @@
</el-form>
</div>
<div class="attr-list" v-if="idAttrShow">
<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermi('base:material-attr:query')">
<small-title
style="margin: 16px 0; padding-left: 8px"
:no-padding="true">
物料属性
</small-title>
<div v-if="!isdetail" class="action_btn">
<div v-if="!isdetail && this.$auth.hasPermi('base:material-attr:create')" class="action_btn">
<template>
<span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
@ -182,16 +182,23 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add';
import { getDictDatas } from "@/utils/dict";
const tableBtn = [
{
type: 'edit',
btnName: '编辑',
},
{
type: 'delete',
btnName: '删除',
},
];
// const tableBtn = [
// this.$auth.hasPermiAnd([
// 'base:material-attr:create',
// 'base:material-attr:update'
// ]) ?
// {
// type: 'edit',
// btnName: '编辑',
// }
// : undefined,
// this.$auth.hasPermi('base:material-attr:delete') ?
// {
// type: 'delete',
// btnName: '删除',
// }
// : undefined,
// ];
const tableProps = [
{
prop: 'createTime',
@ -213,7 +220,23 @@ export default {
components: { SmallTitle, attrAdd },
data() {
return {
tableBtn,
tableBtn: [
this.$auth.hasPermiAnd([
'base:material-attr:create',
'base:material-attr:update'
]) ?
{
type: 'edit',
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:material-attr:delete') ?
{
type: 'delete',
btnName: '删除',
}
: undefined,
],
tableProps,
addOrUpdateVisible: false,
urlOptions: {

2
src/views/base/material/index.vue
View File

@ -134,7 +134,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:material:create') ? 'button' : '',

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

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-21 14:39:52
* @LastEditTime: 2024-04-11 16:44:41
* @Description:
-->
<template>
@ -56,14 +56,14 @@
</el-row>
</el-form>
</div>
<div class="attr-list" v-if="idAttrShow">
<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" 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>
@ -116,16 +116,16 @@ import { parseTime } from '../../core/mixins/code-filter';
import attrAdd from './attr-add';
import { publicFormatter } from '@/utils/dict';
const tableBtn = [
{
type: 'edit',
btnName: '编辑',
},
{
type: 'delete',
btnName: '删除',
},
];
// const tableBtn = [
// {
// type: 'edit',
// btnName: '编辑',
// },
// {
// type: 'delete',
// btnName: '删除',
// },
// ];
const tableProps = [
{
prop: 'createTime',
@ -160,7 +160,24 @@ export default {
components: { SmallTitle, attrAdd },
data() {
return {
tableBtn,
tableBtn: [
this.$auth.hasPermiAnd([
'base:material-product-bom:update',
'base:material-product-bom-det:create',
'base:material-product-bom-det:update'
]) ?
{
type: 'edit',
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:material-product-bom:delete') ?
{
type: 'delete',
btnName: '删除',
}
: undefined,
],
tableProps,
addOrUpdateVisible: false,
urlOptions: {

2
src/views/base/materialProductBom/index.vue
View File

@ -110,7 +110,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:material:create') ? 'button' : '',

2
src/views/core/base/factory/index.vue
View File

@ -125,7 +125,7 @@ export default {
// name: 'reset',
// },
{
type: 'separate',
type: this.$auth.hasPermi('base:core-factory:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('base:core-factory:create') ? 'button' : '',

3
src/views/equipment/base/config/AlarmGroup/index.vue
View File

@ -244,7 +244,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:alarm-group:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:alarm-group:create')

3
src/views/equipment/base/config/BindGroup/index.vue
View File

@ -201,7 +201,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:bind-group:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:bind-group:create')

19
src/views/equipment/base/config/DataCollection/CollectionConfig.vue
View File

@ -158,14 +158,14 @@ export default {
: undefined,
].filter((v) => v),
tableProps: [
{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
{ prop: 'productionLine', label: '产线', minWidth: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
// {
// _action: 'params-bind',
// label: '查看绑定',
@ -217,7 +217,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:collection-config:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:collection-config:create')

11
src/views/equipment/base/config/DataCollection/TableConfig.vue
View File

@ -160,13 +160,12 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('base:equipment-plc:create')
? 'separate' : '',
},
{
// type: this.$auth.hasPermi('equipment:realtime-table-config:create')
// ? 'button'
// : '',
type: 'button',
type: this.$auth.hasPermi('base:equipment-plc:create')
? 'button' : '',
btnName: '新增',
name: 'add',
plain: true,
@ -194,7 +193,7 @@ export default {
input: true,
label: '编码',
prop: 'code',
url: '/base/equipment-group/getCode',
url: '/base/energy-plc/getCode',
rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
},
],

5
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -101,7 +101,10 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:inspection-confirm:create') ||
this.$auth.hasPermi('equipment:inspection-confirm:confirm') ||
this.$auth.hasPermi('equipment:inspection-confirm:export'))
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:inspection-confirm:create')

3
src/views/equipment/base/inspection/Record/index.vue
View File

@ -166,7 +166,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:check-record:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:check-record:export')

3
src/views/equipment/base/inspection/Settings/index.vue
View File

@ -157,7 +157,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:check-setting:create')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:check-setting:create')

14
src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
View File

@ -37,11 +37,11 @@
</el-table-column>
<el-table-column
v-if="selectedBox[0]"
width="160"
minWidth="160"
label="设备保养单号"
:show-overflow-tooltip="true"
prop="maintainOrderNumber"></el-table-column>
<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
<el-table-column v-if="selectedBox[1]" minWidth="128" label="保养计划名称" prop="planName">
<template slot-scope="scope">
{{ scope.row.planName || '---' }}
</template>
@ -67,7 +67,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[5]"
width="150"
minWidth="150"
label="计划结束时间"
prop="planEndTime">
<template slot-scope="scope">
@ -76,7 +76,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[6]"
width="150"
minWidth="150"
label="实际开始时间"
prop="startTime">
<template slot-scope="scope">
@ -85,7 +85,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[7]"
width="150"
minWidth="150"
label="实际结束时间"
prop="endTime">
<template slot-scope="scope">
@ -94,7 +94,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[8]"
width="150"
minWidth="150"
label="确认截止时间"
prop="confirmDueTime">
<template slot-scope="scope">
@ -103,7 +103,7 @@
</el-table-column>
<el-table-column
v-if="selectedBox[9]"
width="150"
minWidth="150"
label="保养计划类型"
prop="relatePlan">
<template slot-scope="scope">

2
src/views/equipment/base/maintain/Confirm/index.vue
View File

@ -157,7 +157,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:export')) ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-confirm:create')

5
src/views/equipment/base/maintain/Monitor/index.vue
View File

@ -131,7 +131,7 @@ export default {
// width: 180,
// filter: parseTime(createTime),
// },
{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
{ prop: 'code', label: '保养计划单号', minWidth: 150, showOverflowtooltip: true },
{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -190,7 +190,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:maintain-monitor:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-monitor:export')

20
src/views/equipment/base/maintain/PlanConfig/index.vue
View File

@ -65,57 +65,57 @@ const tableProps = [
{
prop: 'name',
label: '保养计划名称',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'departmentName',
label: '部门',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'lineName',
label: '产线名',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'maintenancePeriod',
label: '保养频率(天/次)',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'firstMaintenanceTime',
label: '首次保养时间',
filter: parseTime,
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'maintainDuration',
label: '保养时长',
width: 120,
minWidth: 120,
showOverflowtooltip: true
},
{
prop: 'maintainer',
label: '计划保养人员',
width: 150,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'confirmTimeLimit',
label: '确认时限',
filter: toDay,
width: 130,
minWidth: 130,
showOverflowtooltip: true
},
{
prop: 'remark',
label: '备注',
width: 150,
minWidth: 150,
showOverflowtooltip: true
}
];
@ -172,7 +172,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',

21
src/views/equipment/base/maintain/Record/index.vue
View File

@ -131,21 +131,21 @@ export default {
// width: 180,
// filter: timeFilter,
// },
{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 170, showOverflowtooltip: true },
{ prop: 'planName', label: '保养计划名称', width: 150, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', width: 120, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'startTime', label: '实际开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'endTime', label: '实际结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
{ prop: 'maintainOrderNumber', label: '设备保养单号', minWidth: 170, showOverflowtooltip: true },
{ prop: 'planName', label: '保养计划名称', minWidth: 150, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 120, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'startTime', label: '实际开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
{ prop: 'endTime', label: '实际结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
// { prop: 'equipmentName', label: '设备名称' },
// { prop: 'maintainWorker', label: '保养人员' },
{
prop: 'relatePlan',
label: '保养计划类型',
filter: (v) => (v != null ? ['', '计划型', '非计划型'][v] : ''),
width: 170,
minWidth: 170,
showOverflowtooltip: true
},
{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
@ -198,7 +198,8 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: this.$auth.hasPermi('equipment:maintain-record:export')
? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:maintain-record:export')

2
src/views/equipment/base/repair/index.vue
View File

@ -173,7 +173,7 @@ export default {
color: 'primary',
},
{
type: 'separate',
type: (this.$auth.hasPermi('equipment:repair:export') || this.$auth.hasPermi('equipment:repair:create')) ? 'separate' : '',
},
{
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',