scorpio 2 年之前
父節點
當前提交
373ead5884
共有 4 個文件被更改,包括 29 次插入10 次删除
  1. 2 1
      src/layout/left.vue
  2. 1 0
      src/layout/top.vue
  3. 0 1
      src/store/permission.js
  4. 26 8
      src/views/home/component/dash.vue

+ 2 - 1
src/layout/left.vue

@@ -81,6 +81,7 @@ export default {
         if (res.code === 200) {
           this.data = res.data
           this.init()
+          // this.navClick(this.data[0], 0)
         }
       })
     },
@@ -95,7 +96,7 @@ export default {
         )
         this.$bus.emit(
           'navChange',
-          item.remark ? item.children[0].remark : 'project'
+          item.children[0].remark ? item.children[0].remark : 'project'
         )
       } else {
         this.$router.push(item.path)

+ 1 - 0
src/layout/top.vue

@@ -120,6 +120,7 @@ export default {
       this.dataType = tmp
     }
     this.$bus.on('navChange', res => {
+      console.log(res)
       this.dataType = res
     })
   },

+ 0 - 1
src/store/permission.js

@@ -36,7 +36,6 @@ export const permissionStore = defineStore('permissionStore', {
      * @returns {*}
      */
     vaildPermission(key) {
-      console.log(this.permissions[key])
       return this.permissions[key]
     }
   }

+ 26 - 8
src/views/home/component/dash.vue

@@ -35,7 +35,10 @@
           class="ml-20 mt-20"
           icon="Plus"
           title="新增"
-          v-if="dataType === 'project'"
+          v-if="
+            dataType === 'project' &&
+            permissions.vaildPermission('project_new_create')
+          "
           @click="showAdd = true"
         />
         <base-button
@@ -90,7 +93,8 @@
           v-if="
             user.info.viewStage !== 1 &&
             dataType === 'asset' &&
-            row.project_stage !== 7
+            row.project_stage !== 7 &&
+            row.can_update
           "
           icon="Upload"
           type="primary"
@@ -101,9 +105,10 @@
         </el-button>
         <el-button
           v-if="
-            !row.hasOwnProperty('report_type') ||
-            row.report_type === 1 ||
-            row.report_type === 4
+            (!row.hasOwnProperty('report_type') ||
+              row.report_type === 1 ||
+              row.report_type === 4) &&
+            row.can_update
           "
           text
           type="primary"
@@ -115,7 +120,8 @@
           text
           v-if="
             permissions.vaildPermission('projectApprovalBtn') &&
-            row.report_type === 2
+            row.report_type === 2 &&
+            row.can_update
           "
           type="primary"
           icon="el-icon-bell"
@@ -123,7 +129,11 @@
           >审核
         </el-button>
         <el-button
-          v-if="row.hasOwnProperty('report_type') && row.report_type === 3"
+          v-if="
+            row.hasOwnProperty('report_type') &&
+            row.report_type === 3 &&
+            row.can_update
+          "
           text
           type="primary"
           icon="el-icon-upload"
@@ -138,6 +148,14 @@
           v-if="row.project_stage !== 7 && row.can_update"
           >退库
         </el-button>
+        <el-button
+          text
+          type="primary"
+          icon="el-icon-delete"
+          @click="rowDel(row)"
+          v-if="row.can_update"
+          >删除
+        </el-button>
       </template>
       <template #plan_storage_time-header="{ column }">
         <div class="flex flex-center">
@@ -391,7 +409,7 @@ export default {
         editBtnText: '资料管理',
         editBtnIcon: 'Document',
         addBtn: false,
-        delBtn: true,
+        delBtn: false,
         border: true,
         reserveSelection: true,
         align: 'center',