From 02d6ac5bc723b3001d559a87eb8959f6e0e2abba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/integration/systemInfo.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index 5f769cd..56d9cd9 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -1,13 +1,15 @@
 <template>
   <basic-container>
-    <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :search.sync="search" :table-loading="loading"
+    <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :permission="permissionList" :search.sync="search"
+               :table-loading="loading"
                @on-load="getDataList" @row-save="handleSave" @row-del="handleDelete" @row-update="handleEdit"
                @refresh-change="handleRefresh" @size-change="handleSizePage" @current-change="handleCurrentPage"
                @selection-change="selectionChange" @row-click="handleRowClick">
       <template slot="menuLeft">
         <!-- <el-button icon="el-icon-search" size="small" type="primary" @click="handleStatus">鏌� 璇�
         </el-button> -->
-        <el-button icon="el-icon-delete" size="small" type="danger" @click="handleDeleteByIds">鍒� 闄�
+        <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="danger"
+                   @click="handleDeleteByIds">鍒� 闄�
         </el-button>
       </template>
       <template slot="search" slot-scope="{row,size}">
@@ -19,10 +21,11 @@
                   :size="size" clearable style="width:300px;margin-left: 10px;"
                   @clear="handleClear" @keyup.enter.native="handleEnter"></el-input>
       </template>
-      <template #menu="{row,index,size}">
+      <template v-if="permissionList.empower" #menu="{row,index,size}">
         <el-button icon="el-icon-menu" size="small" type="text" @click="classifyHandler(row)">鍒嗙被鎺堟潈</el-button>
-
       </template>
+
+
     </avue-crud>
     <el-dialog :visible.sync="dialogVisible" append-to-body class="avue-dialog avue-dialog--top" title="鍒嗙被鎺堟潈"
                top="-50px">
@@ -54,6 +57,7 @@
   sysInfoTree,
   batchAddSave
 } from '@/api/integration/sysInfo.js'
+import {mapGetters} from "vuex";
 
 export default {
   data() {
@@ -90,7 +94,23 @@
       search: {},
       delIds: [],
       data: [],
-      option: {
+
+    }
+  },
+  created() {
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.systemInfo.systemInfo_add, false),
+        editBtn: this.vaildData(this.permission.systemInfo.systemInfo_edit, false),
+        delBtn: this.vaildData(this.permission.systemInfo.systemInfo_delete, false),
+        empower: this.vaildData(this.permission.systemInfo.systemInfo_empower, false),
+      }
+    },
+    option() {
+      return {
         height: "auto",
         tip: false,
         border: true,
@@ -134,23 +154,21 @@
             type: 'textarea'
           }
         ]
-      },
+      }
     }
-  },
-  created() {
   },
   methods: {
     //閲嶇疆
-    resetting(){
+    resetting() {
       this.$refs.tree.setCheckedKeys([])
       // console.log(this.ParentList)
     },
     empower() {
       batchAddSave(this.checkAll.oid, this.checkAll.id, this.ParentList).then(res => {
         // console.log(res.data)
-        if(res.data.code === 200){
+        if (res.data.code === 200) {
           this.$message.success(res.data.msg)
-          this.dialogVisible=false;
+          this.dialogVisible = false;
         }
       })
     },
@@ -224,16 +242,17 @@
       sysInfoTree({systemOid: row.oid, systemId: row.id}).then(res => {
         let List = [];
         let value = 0;
-        let NumberList= [];
+        let NumberList = [];
+
         function traverse(obj, parent) {
           //閲嶆柊鏋勫缓涓�娆￠�変腑褰撳墠row鐨勬暟鎹�
           const record = {
             label: obj.text,
             oid: obj.oid,
-            attributes:{
+            attributes: {
               classifyId: obj.attributes.classifyId,
               classifyOid: obj.attributes.classifyOid,
-              selected:obj.attributes.selected
+              selected: obj.attributes.selected
             },
             classParentOid: obj.parentId,
             value: value,
@@ -266,6 +285,7 @@
             }
           }
         }
+
         for (let item of res.data) {
           traverse(item, null);
         }
@@ -274,6 +294,7 @@
         // this.ModifyProperties(this.TreeData, 'text', 'label');
         // 鏍规嵁this.TreeData鐨勯暱搴﹁绠楀欢杩熸椂闂�
         const delayTime = this.TreeData.length * 1;
+        console.log(delayTime)
         setTimeout(() => {
           this.loading = false;
           this.reload = Math.random();
@@ -331,6 +352,7 @@
             message: '鏂板鏁版嵁鎴愬姛锛�'
           })
           done(row)
+          await this.getDataList();
           // this.$refs.crud.refreshTable()
           // this.getDataList()
         }
@@ -351,6 +373,7 @@
           })
           done(row)
         }
+        await this.getDataList();
       } catch {
         loading()
       }

--
Gitblit v1.9.3