fix部门页面finish

nladmin-ui/src/views/system/dept/index.vue

@@ -38,12 +38,12 @@
     >
       <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
         <el-form-item label="部门编码" prop="code">
-          <el-input v-model="form.code" style="width: 370px;" />
+          <el-input v-model="form.code" :disabled="true" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="部门名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="部门排序" prop="deptSort">
+        <el-form-item label="部门排序" prop="dept_sort">
           <el-input-number
             v-model.number="form.dept_sort"
             :min="0"
@@ -53,10 +53,7 @@
           />
         </el-form-item>
         <el-form-item label="外部标识" prop="extId">
-          <el-input v-model="form.extId" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="版本ID" prop="versionId">
-          <el-input v-model="form.versionId" style="width: 370px;" />
+          <el-input v-model="form.ext_id" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="顶级部门">
           <el-radio-group v-model="form.isTop" style="width: 140px">
@@ -65,9 +62,13 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="enabled">
-          <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">
-            {{ item.label }}
-          </el-radio>
+          <el-switch
+            v-model="form.is_used"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            active-value="1"
+            inactive-value="0"
+          />
         </el-form-item>
         <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
           <treeselect
@@ -146,22 +147,20 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 
 const defaultForm = {
-  id: null,
   code: null,
   name: null,
   isTop: '1',
   sub_count: 0,
   pid: null,
   dept_sort: 999,
-  enabled: 'true',
-  extId: null,
-  versionId: null
+  is_used: '1',
+  ext_id: null
 }
 export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation },
   cruds() {
-    return CRUD({ title: '部门', url: 'api/dept/vo', crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典
@@ -170,13 +169,10 @@ export default {
     return {
       depts: [],
       rules: {
-        code: [
-          { required: true, message: '请输入编码', trigger: 'blur' }
-        ],
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
-        deptSort: [
+        dept_sort: [
           { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
         ]
       },
@@ -204,12 +200,12 @@ export default {
     [CRUD.HOOK.afterToCU](crud, form) {
       if (form.pid !== null) {
         form.isTop = '0'
-      } else if (form.id !== null) {
+      } else {
         form.isTop = '1'
       }
-      form.enabled = `${form.enabled}`
-      if (form.id != null) {
-        this.getSupDepts(form.id)
+      form.is_used = `${form.is_used}`
+      if (form.pid != null) {
+        this.getSupDepts(form.pid)
       } else {
         this.getDepts()
       }
@@ -257,7 +253,7 @@ export default {
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU]() {
-      if (this.form.pid !== null && this.form.pid === this.form.id) {
+      if (this.form.isTop !== '1' && this.form.pid == null) {
         this.$message({
           message: '上级部门不能为空',
           type: 'warning'