From a5058f8422c6c1696e7ab16692bc610dcb92c628 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 01 九月 2022 17:34:23 +0800
Subject: [PATCH] 1.提交

---
 src/views/jcsz/jsqd.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 73891d7..a7c6972 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -2,10 +2,13 @@
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
 
-      <div class="bodyTopButtonGroup">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-        <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
-        <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+        <div style="display: flex">
+          <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
+          <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        </div>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -97,6 +100,7 @@
             min-width="160"
             label="瑙掕壊鎻忚堪"
             sortable="custom"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.description">{{ row.description }}</div>
@@ -822,6 +826,9 @@
         DeleteRole({ RoleCode: row.role_code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getRoleSearch()
           }
         })
@@ -915,6 +922,9 @@
         RoleTypeDelete({ RoleTypeCode: row.roletype_code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.formSetting.page > 1 && this.RoleTypeCodeArr.length === 1) {
+              this.formSetting.page--
+            }
             this.getRoleTypeSearch()
           }
         })
@@ -1063,7 +1073,8 @@
       this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
 
       this.PCTrue = res[0][0].is_delete === '0'
-      this.APPTrue = res[1][0].is_delete === '0'
+      this.APPTrue = res[1][0].children.filter(item => item.is_delete === '0').length === 0 ? false : res[1][0].is_delete === '0'
+
       // '0'鏄剧ず  '1' 涓嶆樉绀�   杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
       if (this.PCTrue) {
         this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
@@ -1073,7 +1084,7 @@
       }
 
       if (this.APPTrue) {
-        this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || it.is_delete === null)
+        this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || item.is_delete === null)
         this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
           item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
           // item.children = item.children.filter(it => it.is_delete !== '1')

--
Gitblit v1.9.3