zcy 4 gadi atpakaļ
vecāks
revīzija
e3ea1207ec

+ 1 - 1
src/views/basics/pillar/CheckAndEditModel.vue

@@ -101,7 +101,7 @@ export default {
       url: {
         add: '/business/catenary/bus/zzdzxx/add',
         edit: '/business/catenary/bus/zzdzxx/update',
-        tree: '/system/dept/treeselect'
+        tree: '/system/dept/treeSelect'
       }
     }
   },

+ 15 - 36
src/views/sys/menu/CheckAndEditModel.vue

@@ -8,30 +8,17 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="部门名称" prop="deptName">
-        <a-input v-model="model.deptName" />
+      <a-form-model-item label="菜单名称" prop="menuName">
+        <a-input v-model="model.menuName" />
       </a-form-model-item>
-      <a-form-model-item label="上级部门" prop="parentId">
-        <a-tree-select
-          v-model="model.parentId"
-          allow-clear
-          tree-default-expand-all
-          style="width: 100%"
-          :tree-data="treeData"
-          :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-        />
+      <a-form-model-item label="类型" prop="menuType">
+        <a-input v-model="model.menuType" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="主管人员" prop="leader">
-        <sys-list-select-tag
-          v-model="model.userId"
-          dict-code="user"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="部门描述">
-        <a-textarea v-model="model.remark" placeholder="请输入" :rows="4" />
+      <a-form-model-item label="权限标识" prop="perms">
+        <a-input v-model="model.perms" style="width: 100%" />
       </a-form-model-item>
       <a-form-model-item label="排序">
-        <a-input-number style="width: 100%" v-model="model.orderNum" :min="0" :max="100000"/>
+        <a-input-number v-model="model.orderNum" style="width: 100%" :min="0" :max="100000" />
       </a-form-model-item>
     </a-form-model>
   </j-modal>
@@ -39,6 +26,7 @@
 <script>
 import { getAction, httpAction } from '@/api/request'
 import JModal from '@/components/JModal'
+
 export default {
   name: 'CheckAndEditModel',
   components: {
@@ -55,13 +43,14 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
+        menuName: [{ required: true, message: '请输入' }],
+        menuType: [{ required: true, message: '请输入' }],
+        perms: [{ required: true, message: '请输入' }],
+        orderNum: [{ required: true, message: '请输入' }]
       },
       url: {
-        add: '/system/dept',
-        edit: '/system/dept',
-        tree: '/system/dept/treeSelect'
+        add: '/system/menu',
+        edit: '/system/menu'
       }
     }
   },
@@ -71,7 +60,6 @@ export default {
     add() {
       this.model = {}
       this.visible = true
-      this.loadTree()
     },
     edit(record) {
       this.model = Object.assign({}, record)
@@ -79,15 +67,6 @@ export default {
         this.model.parentId = null
       }
       this.visible = true
-      this.loadTree()
-    },
-    loadTree() {
-      this.treeData = []
-      getAction(this.url.tree).then((res) => {
-        if (res.code === 200) {
-          this.treeData = res.data
-        }
-      })
     },
     close(isSubmit) {
       if (isSubmit) {
@@ -107,7 +86,7 @@ export default {
     },
     saveData() {
       let url, type
-      if (!this.model.id) {
+      if (!this.model.menuId) {
         url = this.url.add
         type = 'post'
       } else {

+ 3 - 3
src/views/sys/menu/index.vue

@@ -46,11 +46,11 @@
         ref="table"
         size="middle"
         bordered
-        row-key="deptId"
+        row-key="menuId"
         :columns="columns"
         :defaultExpandedRowKeys="[100]"
         :data-source="dataSource"
-        :pagination="false"
+        :pagination="ipagination"
         :loading="loading"
         :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
@@ -68,7 +68,7 @@
             编辑
           </a-button>
           <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.deptId)">
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.menuId)">
             <a-button size="small" type="danger">
               删除
             </a-button>