From b6bb12ee8067af15e3298e154bbf6bf291495129 Mon Sep 17 00:00:00 2001
From: ky_gyt <ky_gyt@53845ad7-526c-8849-8dfa-ada380865a28>
Date: Tue, 20 Apr 2021 03:16:47 +0000
Subject: [PATCH]

---
 .../src/pages/system/role/roleMenuForm.vue    | 168 ---------------
 .../src/pages/system/role/roleOrgForm.vue     | 195 ------------------
 2 files changed, 363 deletions(-)
 delete mode 100644 Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleMenuForm.vue
 delete mode 100644 Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleOrgForm.vue

diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleMenuForm.vue b/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleMenuForm.vue
deleted file mode 100644
index 7d372ce..0000000
--- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleMenuForm.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-  <a-modal
-    title="授权菜单"
-    :width="600"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="formLoading">
-      <a-form :form="form">
-
-        <a-form-item
-          label="菜单权限"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol">
-
-          <a-tree
-            v-model="checkedKeys"
-            multiple
-            checkable
-            :auto-expand-parent="autoExpandParent"
-            :expanded-keys="expandedKeys"
-            :tree-data="menuTreeData"
-            :selected-keys="selectedKeys"
-            :replaceFields="replaceFields"
-            @expand="onExpand"
-            @select="onSelect"
-            @check="treeCheck"
-          />
-          </a-tree></a-form-item>
-
-      </a-form>
-
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-//   import { sysRoleOwnMenu, sysRoleGrantMenu } from '@/api/modular/system/roleManage'
-
-  export default {
-    data () {
-      return {
-        labelCol: {
-          style: { 'padding-right': '20px' },
-          xs: { span: 24 },
-          sm: { span: 5 }
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 15 }
-        },
-        menuTreeData: [],
-        expandedKeys: [],
-        checkedKeys: [],
-        halfCheckedKeys: [],
-        visible: false,
-        confirmLoading: false,
-        formLoading: true,
-        autoExpandParent: true,
-        selectedKeys: [],
-        subValues: [],
-        roleEntity: [],
-        replaceFields: {
-          key: 'id'
-        },
-        form: this.$form.createForm(this)
-      }
-    },
-
-    methods: {
-      // 初始化方法
-      roleMenu (record) {
-        this.formLoading = true
-        this.roleEntity = record
-        this.visible = true
-        this.getMenuTree()
-        this.expandedMenuKeys(record)
-      },
-
-      /**
-       * 获取菜单列表
-       */
-      getMenuTree () {
-        this.$api.SysMenuTreeForGrant().then((res) => {
-           if (res.success) {
-             this.menuTreeData = res.data
-             // 默认展开目录级
-             this.menuTreeData.forEach(item => {
-               this.expandedKeys.push(item.id)
-             })
-           }
-        })
-      },
-
-      /**
-       * 此角色已有菜单权限
-       */
-      expandedMenuKeys (record) {
-        this.$api.sysRoleOwnMenu({ id: record.id }).then((res) => {
-          if (res.success) {
-            this.checkedKeys = res.data
-            this.findAllChildren(this.menuTreeData)
-          }
-          this.formLoading = false
-        })
-      },
-
-      treeCheck (checkKeys, event) {
-        this.halfCheckedKeys = event.halfCheckedKeys
-      },
-      onExpand (expandedKeys) {
-        this.expandedKeys = expandedKeys
-        this.autoExpandParent = false
-      },
-      onCheck (checkedKeys) {
-        this.checkedKeys = checkedKeys
-      },
-      onSelect (selectedKeys, info) {
-        this.selectedKeys = selectedKeys
-      },
-
-      handleSubmit () {
-        const { form: { validateFields } } = this
-        this.confirmLoading = true
-        validateFields((errors, values) => {
-          if (!errors) {
-             this.$api.sysRoleGrantMenu({ id: this.roleEntity.id, grantMenuIdList: this.checkedKeys.concat(this.halfCheckedKeys) }).then((res) => {
-              if (res.success) {
-                this.$message.success('授权成功')
-                this.confirmLoading = false
-                this.$emit('ok', values)
-                this.handleCancel()
-              } else {
-                this.$message.error('授权失败：' + res.message)
-              }
-            }).finally((res) => {
-              this.confirmLoading = false
-            })
-          } else {
-            this.confirmLoading = false
-          }
-        })
-      },
-      handleCancel () {
-        // 清空已选择的
-        this.checkedKeys = []
-        // 清空已展开的
-        this.expandedKeys = []
-        this.visible = false
-      },
-      // 遍历树形然后获取到对父节点进行移除，使用子节点，而且将父节点加入到mainMenuList
-      findAllChildren(data) {
-        data.forEach((item, index) => {
-          if (item.children.length !== 0) {
-            for (let i = 0; i < this.checkedKeys.length; i++) {
-              if (item.id === this.checkedKeys[i]) {
-                this.checkedKeys.splice(i, 1)
-              }
-            }
-            this.findAllChildren(item.children)
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleOrgForm.vue b/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleOrgForm.vue
deleted file mode 100644
index 03fd200..0000000
--- a/Api/Ewide.Core/Ewide.Core.Web.Src/src/pages/system/role/roleOrgForm.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <a-modal
-    title="授权数据"
-    :width="600"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="formLoading">
-      <a-form :form="form">
-        <a-form-item
-          label="授权范围"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          has-feedback
-        >
-          <a-select style="width: 100%" placeholder="请选择授权范围" v-decorator="['dataScopeType', {rules: [{ required: true, message: '请选择授权范围！' }]}]" >
-            <a-select-option v-for="(item,index) in dataScopeTypeData" :key="index" :value="item.code" @click="handleChange(item.code)">{{ item.value }}</a-select-option>
-          </a-select>
-        </a-form-item>
-        <div v-show="orgTreeShow">
-          <a-form-item
-            label="选择机构"
-            :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-          >
-            <a-tree
-              v-model="checkedKeys"
-              checkable
-              checkStrictly
-              :auto-expand-parent="autoExpandParent"
-              :expanded-keys="expandedKeys"
-              :tree-data="orgTreeData"
-              :selected-keys="selectedKeys"
-              :replaceFields="replaceFields"
-              @expand="onExpand"
-              @select="onSelect"
-            />
-          </a-form-item>
-        </div>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-
-  export default {
-    data () {
-      return {
-        labelCol: {
-          style: { 'padding-right': '20px' },
-          xs: { span: 24 },
-          sm: { span: 5 }
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 15 }
-        },
-        orgTreeData: [],
-        expandedKeys: [],
-        checkedKeys: [],
-        visible: false,
-        confirmLoading: false,
-        formLoading: true,
-        autoExpandParent: true,
-        selectedKeys: [],
-        subValues: [],
-        roleEntity: [],
-        dataScopeTypeData: [],
-        orgTreeShow: false,
-        replaceFields: {
-          key: 'id'
-        },
-        form: this.$form.createForm(this)
-      }
-    },
-
-    methods: {
-      // 初始化方法
-      roleOrg (record) {
-        this.roleEntity = record
-        this.visible = true
-        this.formLoading = true
-        this.sysDictTypeDropDown()
-        this.form.getFieldDecorator('dataScopeType', { initialValue: record.dataScopeType.toString() })
-        this.handleChange(record.dataScopeType)
-      },
-
-      /**
-       * 获取字典数据
-       */
-      sysDictTypeDropDown () {
-        // 数据范围
-        this.$api.sysDictTypeDropDown({ code: 'data_scope_type' }).then((res) => {
-          this.dataScopeTypeData = res.data
-          this.formLoading = false
-        })
-      },
-
-      // 范围下拉框事件
-      handleChange (value) {
-        // eslint-disable-next-line eqeqeq
-        if (value == '5') {
-          this.formLoading = true
-          this.orgTreeShow = true
-          // 获取机构树
-          this.getOrgTree()
-          // 已关联数据
-          this.sysRoleOwnData(this.roleEntity)
-        } else {
-          this.orgTreeShow = false
-          // 清理已选中机构
-          this.checkedKeys = []
-        }
-      },
-
-      /**
-       * 获取机构树
-       */
-      getOrgTree () {
-        this.$api.getOrgTree().then((res) => {
-           if (res.success) {
-             this.orgTreeData = res.data
-             // 默认展开
-             this.orgTreeData.forEach(item => {
-               this.expandedKeys.push(item.id)
-             })
-           }
-        })
-      },
-
-      /**
-       * 此角色已有数据列表
-       */
-      sysRoleOwnData (record) {
-        this.$api.sysRoleOwnData({ id: record.id }).then((res) => {
-          if (res.success) {
-            //console.log(JSON.stringify(res.data))
-            this.checkedKeys = res.data
-          }
-          this.formLoading = false
-        })
-      },
-
-      onExpand (expandedKeys) {
-        this.expandedKeys = expandedKeys
-        this.autoExpandParent = false
-      },
-      onCheck (checkedKeys) {
-        //console.log(JSON.stringify(checkedKeys))
-        this.checkedKeys = checkedKeys
-      },
-      onSelect (selectedKeys, info) {
-        this.selectedKeys = selectedKeys
-      },
-
-      handleSubmit () {
-        const { form: { validateFields } } = this
-        this.confirmLoading = true
-        validateFields((errors, values) => {
-          if (!errors) {
-            const checkedKeys = this.checkedKeys.checked === undefined ? this.checkedKeys : this.checkedKeys.checked
-            this.$api.sysRoleGrantData({ id: this.roleEntity.id, grantOrgIdList: checkedKeys, dataScopeType: values.dataScopeType }).then((res) => {
-              this.confirmLoading = false
-              if (res.success) {
-                this.$message.success('授权成功')
-                this.$emit('ok', values)
-                this.handleCancel()
-              } else {
-                this.$message.error('授权失败：' + res.message)
-              }
-            }).finally((res) => {
-              this.confirmLoading = false
-            })
-          } else {
-            this.confirmLoading = false
-          }
-        })
-      },
-      handleCancel () {
-        this.form.resetFields()
-        // 清空已选择的
-        this.checkedKeys = []
-        // 清空已展开的
-        this.expandedKeys = []
-        this.visible = false
-        // 隐藏机构树
-        this.orgTreeShow = false
-      }
-    }
-  }
-</script>