!82 修复bug

修复BUG: 权限管理编辑时,复选框父子级严格关联的问题
修复BUG: 修复软删除bug

web/src/install.js

@@ -259,10 +259,6 @@ Vue.prototype.commonEndColumns = function (param = {}) {
     create_datetime: {
       showForm: (param.create_datetime && param.create_datetime.showForm) !== undefined ? param.create_datetime.showForm : false,
       showTable: (param.create_datetime && param.create_datetime.showTable) !== undefined ? param.create_datetime.showTable : true
-    },
-    is_deleted: {
-      showForm: (param.is_deleted && param.is_deleted.showForm) !== undefined ? param.is_deleted.showForm : false,
-      showTable: (param.is_deleted && param.is_deleted.showTable) !== undefined ? param.is_deleted.showTable : false
     }
   }
   return [
@@ -381,23 +377,6 @@ Vue.prototype.commonEndColumns = function (param = {}) {
       form: {
         disabled: !showData.create_datetime.showForm
       }
-    },
-    {
-      title: '是否软删除',
-      key: 'is_deleted',
-      width: 160,
-      search: {
-        disabled: !showData.is_deleted.showForm
-      },
-      show: showData.is_deleted.showTable,
-      type: 'radio',
-      dict: {
-        data: [{ label: '是', value: true }, { label: '否', value: false }]
-      },
-      form: {
-        disabled: !showData.is_deleted.showForm
-
-      }
     }
   ]
 }

web/src/views/system/rolePermission/index.vue

@@ -93,7 +93,7 @@
               :default-checked-keys="menuCheckedKeys"
               :check-on-click-node="false"
               empty-text="请先选择角色"
-              :check-strictly="false"
+              :check-strictly="menuCheckStrictly"
               @check-change="handleCheckClick"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -142,6 +142,7 @@ export default {
       menuOptions: [],
       permissionData: [],
       menuCheckedKeys: [], // 菜单默认选中的节点
+      menuCheckStrictly: false,
       deptOptions: [],
       deptCheckedKeys: [],
       dataScopeOptions: [
@@ -199,6 +200,7 @@ export default {
       this.getDeptData()
       this.getMenuData(this.roleObj)
       this.menuCheckedKeys = this.roleObj.menu // 加载已勾选的菜单
+      this.menuCheckStrictly = true // 父子不相互关联
       this.deptCheckedKeys = this.roleObj.dept
     },
     addRequest (row) {
@@ -292,6 +294,7 @@ export default {
         children,
         parent
       } = data
+      this.menuCheckStrictly = false
       for (const item of menuPermission) {
         this.$set(item, 'checked', checked)
       }