From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] 	modified:   src/page/index/top/index.vue 	modified:   src/views/common/part.vue 	modified:   src/views/equipment/equipment/index.vue 	modified:   src/views/equipment/metering/index.vue 	modified:   src/views/plan/manufacturingorder/auto-operationtask.vue 	modified:   src/views/plan/operationtask/operationtask-form.vue 	modified:   src/views/quality/Packaging_ledger/index.vue 	modified:   src/views/quality/packageinspect/index.vue 	modified:   src/views/quality/processconfiguration/index.vue 	modified:   src/views/quality/teststandard/index.vue 	modified:   vue.config.js

---
 src/views/quality/packageinspect/index.vue |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/quality/packageinspect/index.vue b/src/views/quality/packageinspect/index.vue
index 1e7783d..e8a924d 100644
--- a/src/views/quality/packageinspect/index.vue
+++ b/src/views/quality/packageinspect/index.vue
@@ -141,20 +141,8 @@
                         searchInfoType: 'text'
                     },
                 ],
-                toolbar: [
-                    // {
-                    //     text: '鏂板',
-                    //     type: 'primary',
-                    //     fun: this.addOrUpdateHandle
-                    // },
-                ],
-                operator: [
-                {
-                    text: '浣滃簾',
-                    type: 'text',
-                    size: 'small',
-                    fun: this.deleteHandle
-                }],
+                toolbar: [],
+                operator: null,
                 operatorConfig: {
                 fixed: 'right',
                 label: '鎿嶄綔',
@@ -167,7 +155,16 @@
     components: {
         ttable,
     },
-    created() { },
+    created() { 
+        if(this.permissions.quality_packageinspect_del){
+            this.table.operator = [{
+                    text: '浣滃簾',
+                    type: 'text',
+                    size: 'small',
+                    fun: this.deleteHandle
+                }]
+        }
+     },
     computed: {
         ...mapGetters(['permissions'])
     },
@@ -199,12 +196,16 @@
         },
         // 鏂板 / 淇敼
         addOrUpdateHandle(row) {
+            if(!this.permissions.quality_packageinspect_edit && row.id!=null){
+                this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+                return
+            }
             this.$router.push({
                 name: 'packageInspectForm',
                 query: { 
                     id: row == null ? null : row.id
                  },
-                 params:{resultVal : row == null ? null : row.result}
+                 params:{resultVal : row.result=='' ? null : row.result}
             })
         },
         formatResult(row, column, cellValue){

--
Gitblit v1.9.3