From a1c54e1c1610c96ea5c6c81f371c47c323bc3ff5 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 15 一月 2024 12:58:26 +0800
Subject: [PATCH] 	modified:   src/page/wel.vue 	modified:   src/views/equipment/equipment/index.vue

---
 src/views/equipment/equipment/index.vue |   93 +++++++++++++++++++++++++---------------------
 1 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 3d83470..9fd2e4d 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -68,7 +68,7 @@
       multipleSelection: [],
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/equipment/upload'
       },
       diaPrintTab: false,
@@ -147,7 +147,7 @@
             label: '浣嶇疆',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 閭
@@ -167,7 +167,7 @@
             label: '渚涘簲鍟�',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍒堕�犲晢
@@ -177,7 +177,7 @@
             label: '鍒堕�犲晢',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍨嬪彿瑙勬牸
@@ -187,7 +187,7 @@
             label: '鍨嬪彿瑙勬牸',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍒堕�犳棩鏈�
@@ -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,48 @@
     ...mapGetters(['permissions'])
   },
   created() {
+    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
@@ -295,7 +305,7 @@
                 printable: 'printRaw',//椤甸潰
                 type: "html",//鏂囨。绫诲瀷
                   maxWidth:450,
-                  targetStyles:['*'],                 
+                  targetStyles:['*'],
                   style: `@page {
                     margin:0;
                     padding: 0;
@@ -318,7 +328,7 @@
     pullEquipFun(){
       this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
       pullEquip().then(res=>{
-        this.$message.success(res.data.data.msg)
+        this.$message.success(res.data.msg)
         this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
       }).catch(error=>{
         this.$message.error("鍚屾澶辫触",error)
@@ -343,7 +353,6 @@
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
-      console.log(this.multipleSelection);
     },
     // 鏂板 / 淇敼
     addOrUpdateHandle(row) {

--
Gitblit v1.9.3