From b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60 Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期三, 27 十二月 2023 17:41:06 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/equipment/equipment/index.vue | 79 ++++++++++++++++++++++----------------- 1 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue index 083640d..462fdcc 100644 --- a/src/views/equipment/equipment/index.vue +++ b/src/views/equipment/equipment/index.vue @@ -225,40 +225,8 @@ searchInfoType: 'text' } ], - toolbar: [ - { - text: '鏂板', - type: 'primary', - fun: this.addOrUpdateHandle - }, - { - text: '鏍囩鎵撳嵃', - type: 'primary', - fun: this.labelPrint - }, - { - text: '鍚屾', - type: 'primary', - loading: false, - fun: this.pullEquipFun - } - ], - operator: [ - { - text: '淇敼', - icon: 'el-icon-edit', - type: 'text', - size: 'small', - fun: this.addOrUpdateHandle - }, - { - text: '鍒犻櫎', - icon: 'el-icon-delete', - type: 'text', - size: 'small', - fun: this.deleteHandle - } - ], + toolbar: [], + operator: null, operatorConfig: { fixed: 'right', label: '鎿嶄綔', @@ -279,6 +247,49 @@ ...mapGetters(['permissions']) }, created() { + this.uploadInfo.isShow = this.permissions.equipment_equipment_upload + if(this.permissions.equipment_equipment_add){ + this.table.toolbar.push({ + text: '鏂板', + type: 'primary', + fun: this.addOrUpdateHandle + }) + } + if(this.permissions.equipment_equipment_labelprint){ + this.table.toolbar.push({ + text: '鏍囩鎵撳嵃', + type: 'primary', + fun: this.labelPrint + }) + } + if(this.permissions.equipment_equipment_sync){ + this.table.toolbar.push({ + text: '鍚屾', + type: 'primary', + loading: false, + fun: this.pullEquipFun + }) + } + let arr = [] + if(this.permissions.equipment_equipment_edit){ + arr.push({ + text: '淇敼', + icon: 'el-icon-edit', + type: 'text', + size: 'small', + fun: this.addOrUpdateHandle + }) + } + if(this.permissions.equipment_equipment_del){ + arr.push({ + text: '鍒犻櫎', + icon: 'el-icon-delete', + type: 'text', + size: 'small', + fun: this.deleteHandle + }) + } + this.table.operator = arr.length>0 ? arr : null remote('work_shop').then((response) => { if (response.data.code === 0) { this.workshopList = response.data.data -- Gitblit v1.9.3