From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突

---
 src/views/equipment/metering/index.vue |   72 +++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 1fdc251..ecdc081 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -68,8 +68,8 @@
         multipleSelection: [],
         uploadInfo: {
           // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-          Download:false,
-         isShow: true,
+          download:false,
+          isShow: true,
           url: '/mes/equipmentDevice/upload'
         },
         prelang: 'workstation',
@@ -97,6 +97,7 @@
             // 璁惧缂栧彿
             {
               minWidth: '30',
+              width: '100',
               prop: 'code',
               label: '璁惧缂栧彿',
               sort: true,
@@ -110,6 +111,7 @@
             // 璁惧鍚嶇О
             {
               minWidth: '30',
+              width: '100',
               prop: 'name',
               label: '璁惧鍚嶇О',
               sort: true,
@@ -145,7 +147,7 @@
  // 鍒堕�犳棩鏈�
  {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'createTime',
               label: '鏍″噯鏃堕棿',
               sort: true,
@@ -157,7 +159,7 @@
            
             {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'updateTime',
               label: '鏍″噯鍒版湡鏃堕棿',
               sort: true,
@@ -261,16 +263,6 @@
             },
           ],
           toolbar: [
-            {
-              text: '鏂板',
-              type: 'primary',
-              fun: this.addOrUpdateHandle
-            },
-            {
-              text: '鏍囩鎵撳嵃',
-              type: 'primary',
-              fun: this.labelPrint
-            },
             // {
             //   text: '鍚屾',
             //   type: 'primary',
@@ -278,22 +270,7 @@
             //   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
-            }
-          ],
+          operator: null,
           operatorConfig: {
             fixed: 'right',
             label: '鎿嶄綔',
@@ -315,6 +292,41 @@
       ...mapGetters(['permissions'])
     },
     created() {
+      this.uploadInfo.isShow = this.permissions.equipment_metering_upload
+      if(this.permissions.equipment_metering_add){
+        this.table.toolbar.push({
+              text: '鏂板',
+              type: 'primary',
+              fun: this.addOrUpdateHandle
+            })
+      }
+      if(this.permissions.equipment_metering_labelprint){
+        this.table.toolbar.push({
+                text: '鏍囩鎵撳嵃',
+                type: 'primary',
+                fun: this.labelPrint
+              })
+      }
+      let arr = []
+      if(this.permissions.equipment_metering_edit){
+        arr.push({
+              text: '淇敼',
+              icon: 'el-icon-edit',
+              type: 'text',
+              size: 'small',
+              fun: this.addOrUpdateHandle
+            })
+      }
+      if(this.permissions.equipment_metering_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