From 51ec0fbe59a3c7768996072874ea6f0c2b91c060 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 十二月 2023 13:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/plan/productionschedul/index.vue |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 72fd3d4..8ff933b 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -16,8 +16,18 @@
             @selection-change="selectionRow"
             :table-loading="loading">
             <template #menu="{ row, index }">
-              <el-button type="text" icon="el-icon-edit" size="small" @click="editHandle(row, index)">缂栬緫</el-button>
-              <el-button type="text" icon="el-icon-delete" size="small" @click="deleteHandle(row, index)">鍒犻櫎</el-button>
+              <el-button 
+              v-if="permissions.plan_productionschedul_edit" 
+              type="text" 
+              icon="el-icon-edit" 
+              size="small" 
+              @click="editHandle(row, index)">缂栬緫</el-button>
+              <el-button 
+              v-if="permissions.plan_productionschedul_del" 
+              type="text" 
+              icon="el-icon-delete" 
+              size="small" 
+              @click="deleteHandle(row, index)">鍒犻櫎</el-button>
             </template>
           </avue-crud>
           </div>
@@ -27,7 +37,7 @@
             <el-card>
               <div slot="header" class="clearfix">
                 <span>璋冨害鏃堕棿绾�</span>
-                <el-button v-if="scheduleList.length>0" @click="openEditDialog" style="float: right; padding: 3px 0" type="text">缂栬緫</el-button>
+                <el-button v-if="permissions.plan_productionschedul_edit_line && scheduleList.length>0" @click="openEditDialog" style="float: right; padding: 3px 0" type="text">缂栬緫</el-button>
               </div>
               <div style="height:70vh;overflow-y: scroll;">
                 <el-timeline>
@@ -274,6 +284,9 @@
         ],
       },
       spanArr: [{
+        prop: 'id',
+        span: []
+      },{
         prop: 'projectName',
         span: []
       }, {
@@ -306,6 +319,9 @@
     ...mapGetters(['permissions']),
   },
   created(){
+    if(!this.permissions.plan_productionschedul_edit && !this.permissions.plan_productionschedul_del){
+      this.option.menu = false
+    }
     this.loading = true
     this.getData()
     this.getParamType()

--
Gitblit v1.9.3