还原部门页面

Yi.Vue3.X.RuoYi/src/api/system/dept.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询部门列表
-export function listData(query) {
+export function listDept(query) {
   return request({
     url: '/dept/SelctGetList',
     method: 'get',
@@ -18,7 +18,7 @@ export function listData(query) {
 // }
 
 // 查询部门详细
-export function getData(deptId) {
+export function getDept(deptId) {
   return request({
     url: '/dept/getById/' + deptId,
     method: 'get'
@@ -26,7 +26,7 @@ export function getData(deptId) {
 }
 
 // 新增部门
-export function addData(data) {
+export function addDept(data) {
   return request({
     url: '/dept/add',
     method: 'post',
@@ -35,7 +35,7 @@ export function addData(data) {
 }
 
 // 修改部门
-export function updateData(data) {
+export function updateDept(data) {
   return request({
     url: '/dept/update',
     method: 'put',
@@ -44,7 +44,7 @@ export function updateData(data) {
 }
 
 // 删除部门
-export function delData(deptId) {
+export function delDept(deptId) {
   if("string"==typeof(deptId))
   {
     deptId=[deptId];

Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue

@@ -1,30 +1,16 @@
 <template>
-
    <div class="app-container">
-       <el-form
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         :model="queryParams"
+         <el-form-item label="部门名称" prop="deptName">
-         ref="queryRef"
-         :inline="true"
-         v-show="showSearch"
-         label-width="68px"
-       >
-         <el-form-item label="部门名称" prop="deptName" >
             <el-input
                v-model="queryParams.deptName"
                placeholder="请输入部门名称"
                clearable
-             style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-   
          <el-form-item label="状态" prop="isDeleted">
-           <el-select
+            <el-select v-model="queryParams.isDeleted" placeholder="部门状态" clearable>
-             v-model="queryParams.isDeleted"
-             placeholder="状态"
-             clearable
-             style="width: 240px"
-           >
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -33,20 +19,8 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px">
-           <el-date-picker
-             v-model="dateRange"
-             value-format="YYYY-MM-DD"
-             type="daterange"
-             range-separator="-"
-             start-placeholder="开始日期"
-             end-placeholder="结束日期"
-           ></el-date-picker>
-         </el-form-item>
          <el-form-item>
-           <el-button type="primary" icon="Search" @click="handleQuery"
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-             >搜索</el-button
-           >
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
       </el-form>
@@ -58,164 +32,118 @@
                plain
                icon="Plus"
                @click="handleAdd"
-             v-hasPermi="['business:dept:add']"
+               v-hasPermi="['system:dept:add']"
-             >新增</el-button
+            >新增</el-button>
-           >
          </el-col>
          <el-col :span="1.5">
             <el-button
-             type="success"
+               type="info"
                plain
-             icon="Edit"
+               icon="Sort"
-             :disabled="single"
+               @click="toggleExpandAll"
-             @click="handleUpdate"
+            >展开/折叠</el-button>
-             v-hasPermi="['business:dept:edit']"
-             >修改</el-button
-           >
          </el-col>
-         <el-col :span="1.5">
+         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-           <el-button
-             type="danger"
-             plain
-             icon="Delete"
-             :disabled="multiple"
-             @click="handleDelete"
-             v-hasPermi="['business:dept:remove']"
-             >删除</el-button
-           >
-         </el-col>
-         <el-col :span="1.5">
-           <el-button
-             type="warning"
-             plain
-             icon="Download"
-             @click="handleExport"
-             v-hasPermi="['business:dept:export']"
-             >导出</el-button
-           >
-         </el-col>
-         <right-toolbar
-           v-model:showSearch="showSearch"
-           @queryTable="getList"
-         ></right-toolbar>
       </el-row>
 
       <el-table
+         v-if="refreshTable"
          v-loading="loading"
          :data="deptList"
-         @selection-change="handleSelectionChange"
+         row-key="id"
-       >
+         :default-expand-all="isExpandAll"
-         <el-table-column type="selection" width="55" align="center" />
+         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-         <el-table-column label="编号" align="center" prop="id" />
-   
-         <el-table-column
-           label="部门标题"
-           align="center"
-           prop="title"
-           :show-overflow-tooltip="true"
-         />
-   
-         <el-table-column
-           label="部门部分内容"
-           align="left"
-           prop="content"
-           :show-overflow-tooltip="true"
       >
+         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+         <el-table-column prop="isDeleted" label="状态" width="100">
             <template #default="scope">
-           {{scope.row.content.slice(0,30)}}
+               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
-           </template>
-   
-   
-   </el-table-column>
-   
-   
-   
-         <el-table-column label="状态" align="center" prop="isDeleted">
-           <template #default="scope">
-             <dict-tag
-               :options="sys_normal_disable"
-               :value="scope.row.isDeleted"
-             />
             </template>
          </el-table-column>
-         <el-table-column
+         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-           label="备注"
-           align="center"
-           prop="remark"
-           :show-overflow-tooltip="true"
-         />
-         <el-table-column
-           label="创建时间"
-           align="center"
-           prop="createTime"
-           width="180"
-         >
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column
+         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-           label="操作"
-           align="center"
-           class-name="small-padding fixed-width"
-         >
             <template #default="scope">
                <el-button
                   type="text"
                   icon="Edit"
-               @click="handleOpen(scope.row)"
+                  @click="handleUpdate(scope.row)"
-         
+                  v-hasPermi="['system:dept:edit']"
-               >部门详情</el-button
+               >修改</el-button>
-             >
-   
                <el-button
                   type="text"
-               icon="Edit"
+                  icon="Plus"
-               @click="handleUpdate(scope.row)"
+                  @click="handleAdd(scope.row)"
-               v-hasPermi="['business:dept:edit']"
+                  v-hasPermi="['system:dept:add']"
-               >修改</el-button
+               >新增</el-button>
-             >
                <el-button
+                  v-if="scope.row.parentId != 0"
                   type="text"
                   icon="Delete"
                   @click="handleDelete(scope.row)"
-               v-hasPermi="['business:dept:remove']"
+                  v-hasPermi="['system:dept:remove']"
-               >删除</el-button
+               >删除</el-button>
-             >
             </template>
          </el-table-column>
       </el-table>
 
-       <pagination
+      <!-- 添加或修改部门对话框 -->
-         v-show="total > 0"
+      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-         :total="total"
+         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
-         v-model:page="queryParams.pageNum"
+            <el-row>
-         v-model:limit="queryParams.pageSize"
+               <el-col :span="24" v-if="form.parentId !== 0">
-         @pagination="getList"
+                  <el-form-item label="上级部门" prop="parentId">
+                     <el-tree-select
+                        v-model="form.parentId"
+                        :data="deptOptions"
+                        :props="{ value: 'id', label: 'deptName', children: 'children' }"
+                        value-key="id"
+                        placeholder="选择上级部门"
+                        check-strictly
                      />
-   
-       <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
-           <el-form-item label="部门标题" prop="title">
-                  <el-input v-model="form.title" placeholder="请输入部门标题" />
                   </el-form-item>
-           <el-form-item label="状态" prop="isDeleted">
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="部门名称" prop="deptName">
+                     <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="显示排序" prop="orderNum">
+                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="负责人" prop="leader">
+                     <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="联系电话" prop="phone">
+                     <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="邮箱" prop="email">
+                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="部门状态">
                      <el-radio-group v-model="form.isDeleted">
                         <el-radio
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
-                 :label="JSON.parse(dict.value)"
+                           :label="dict.value"
-                 >{{ dict.label }}</el-radio
+                        >{{ dict.label }}</el-radio>
-               >
                      </el-radio-group>
                   </el-form-item>
-           <el-form-item label="备注" prop="remark">
+               </el-col>
-             <el-input
+            </el-row>
-               v-model="form.remark"
-               type="textarea"
-               placeholder="请输入内容"
-             ></el-input>
-           </el-form-item>
          </el-form>
          <template #footer>
             <div class="dialog-footer">
@@ -225,123 +153,128 @@
          </template>
       </el-dialog>
    </div>
+</template>
 
+<script setup name="Dept">
+import { listDept, getDept, delDept, addDept, updateDept} from "@/api/system/dept";
 
-   </template>
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
-   <script setup>
+const deptList = ref([]);
-   import {
+const open = ref(false);
-     listData,
+const loading = ref(true);
-     getData,
+const showSearch = ref(true);
-     delData,
+const title = ref("");
-     addData,
+const deptOptions = ref([]);
-     updateData,
+const isExpandAll = ref(true);
-   } from "@/api/system/dept";
+const refreshTable = ref(true);
-   import { ref } from "@vue/reactivity";
-   import { computed } from "@vue/runtime-core";
 
-   const { proxy } = getCurrentInstance();
+const data = reactive({
-   const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
-   
-   const deptList = ref([]);
-   const open = ref(false);
-   const loading = ref(true);
-   const showSearch = ref(true);
-   const ids = ref([]);
-   const single = ref(true);
-   const multiple = ref(true);
-   const total = ref(0);
-   const title = ref("");
-   const dateRange = ref([]);
-   const deptDialogVisible=ref(false);
-   const deptId=ref("");
-   const data = reactive({
   form: {},
   queryParams: {
-       pageNum: 1,
-       pageSize: 10,
     deptName: undefined,
-       isDeleted: undefined,
+    isDeleted: undefined
   },
   rules: {
-      deptName: [{ required: true, message: "部门标题不能为空", trigger: "blur" }],
+    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
+    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
+    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
   },
-   });
+});
 
+const { queryParams, form, rules } = toRefs(data);
 
-   const { queryParams, form, rules } = toRefs(data);
+/** 查询部门列表 */
-   
+function getList() {
-   /** 查询列表 */
-   function getList() {
   loading.value = true;
-     listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+  listDept(queryParams.value).then(response => {
-       (response) => {
+    deptList.value = proxy.handleTree(response.data, "id");
-         deptList.value = response.data.data;
-         total.value = response.data.total;
     loading.value = false;
-       }
+  });
-     );
+}
-   }
+/** 取消按钮 */
-   /** 取消按钮 */
+function cancel() {
-   function cancel() {
   open.value = false;
   reset();
-   }
+}
-   /** 表单重置 */
+/** 表单重置 */
-   function reset() {
+function reset() {
   form.value = {
     id: undefined,
-       title: undefined,
+    parentId: undefined,
-       isDeleted: false,
+    deptName: undefined,
-       remark: undefined,
+    orderNum: 0,
+    leader: undefined,
+    phone: undefined,
+    email: undefined,
+    isDeleted: false
   };
-     proxy.resetForm("dataRef");
+  proxy.resetForm("deptRef");
-   }
+}
-   /** 搜索按钮操作 */
+/** 搜索按钮操作 */
-   function handleQuery() {
+function handleQuery() {
-     queryParams.value.pageNum = 1;
   getList();
-   }
+}
-   /** 重置按钮操作 */
+/** 重置按钮操作 */
-   function resetQuery() {
+function resetQuery() {
-     dateRange.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
-   }
+}
-   /** 新增按钮操作 */
+/** 新增按钮操作 */
-   function handleAdd() {
+function handleAdd(row) {
   reset();
+  listDept().then(response => {
+    deptOptions.value = proxy.handleTree(response.data, "deptId");
+    deptOptions.value = proxy.handleTree(response.data, "id");
+  });
+  if (row != undefined) {
+    form.value.parentId = row.deptId;
+    form.value.parentId = row.id;
+  }
   open.value = true;
   title.value = "添加部门";
-   }
+}
-   /** 多选框选中数据 */
+/** 展开/折叠操作 */
-   function handleSelectionChange(selection) {
+function toggleExpandAll() {
-     ids.value = selection.map((item) => item.id);
+  refreshTable.value = false;
-     single.value = selection.length != 1;
+  isExpandAll.value = !isExpandAll.value;
-     multiple.value = !selection.length;
+  nextTick(() => {
-   }
+    refreshTable.value = true;
-   /** 修改按钮操作 */
+  });
-   function handleUpdate(row) {
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
   reset();
-     const id = row.id || ids.value;
+  listDeptExcludeChild(row.deptId).then(response => {
-     getData(id).then((response) => {
+    deptOptions.value = proxy.handleTree(response.data, "deptId");
+  listDept().then(response => {
+   //前端排除自己
+   
+    deptOptions.value = proxy.handleTree(response.data.filter(i=>i.id!=row.id), "id");
+  });
+
+  getDept(row.id).then(response => {
     form.value = response.data;
     open.value = true;
-       title.value = "修改部门类型";
+    title.value = "修改部门";
   });
-   }
+})
-   /** 提交按钮 */
+}
-   function submitForm() {
+/** 提交按钮 */
-     proxy.$refs["dataRef"].validate((valid) => {
+function submitForm() {
+  proxy.$refs["deptRef"].validate(valid => {
     if (valid) {
       if (form.value.id != undefined) {
-           updateData(form.value).then((response) => {
+        updateDept(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-           addData(form.value).then((response) => {
+        addDept(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -349,28 +282,16 @@
       }
     }
   });
-   }
+}
-   /** 删除按钮操作 */
+/** 删除按钮操作 */
-   function handleDelete(row) {
+function handleDelete(row) {
-     const delIds = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
-     proxy.$modal
+    return delDept(row.id);
-       .confirm('是否确认删除编号为"' + delIds + '"的数据项？')
+  }).then(() => {
-       .then(function () {
-         return delData(delIds);
-       })
-       .then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-       })
+  }).catch(() => {});
-       .catch(() => {});
+}
-   }
-   /** 导出按钮操作 */
-   function handleExport() {}
 
-   /** 打开部门详情 */
+getList();
-   function handleOpen(row){
+</script>
-       deptId.value=row.id;
-       deptDialogVisible.value=true;
-   }
-   getList();
-   </script>

Yi.Vue3.X.RuoYi/src/views/system/role/index.vue

@@ -379,7 +379,7 @@ import {
   treeselect as menuTreeselect,
   listMenu,
 } from "@/api/system/menu";
-import { listData as listDept, roleDeptTreeselect } from "@/api/system/dept";
+import { listDept, roleDeptTreeselect } from "@/api/system/dept";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");

Yi.Vue3.X.RuoYi/src/views/system/user/index.vue

@@ -239,7 +239,7 @@ import { getToken } from "@/utils/auth";
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
 import { roleOptionselect } from "@/api/system/role";
 import { postOptionselect } from "@/api/system/post";
-import { listData as listDept } from "@/api/system/dept";
+import { listDept } from "@/api/system/dept";
 
 
 const router = useRouter();

Yi.Vue3.x.RuoYi/src/views/bbs/article/index.vue

@@ -58,7 +58,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['business:article:add']"
+          v-hasPermi="['bbs:article:add']"
           >新增</el-button
         >
       </el-col>
@@ -69,7 +69,7 @@
           icon="Edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['business:article:edit']"
+          v-hasPermi="['bbs:article:edit']"
           >修改</el-button
         >
       </el-col>
@@ -80,7 +80,7 @@
           icon="Delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['business:article:remove']"
+          v-hasPermi="['bbs:article:remove']"
           >删除</el-button
         >
       </el-col>
@@ -90,7 +90,7 @@
           plain
           icon="Download"
           @click="handleExport"
-          v-hasPermi="['business:article:export']"
+          v-hasPermi="['bbs:article:export']"
           >导出</el-button
         >
       </el-col>
@@ -172,14 +172,14 @@
             type="text"
             icon="Edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:article:edit']"
+            v-hasPermi="['bbs:article:edit']"
             >修改</el-button
           >
           <el-button
             type="text"
             icon="Delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['business:article:remove']"
+            v-hasPermi="['bbs:article:remove']"
             >删除</el-button
           >
         </template>
@@ -241,7 +241,7 @@ import {
   delData,
   addData,
   updateData,
-} from "@/api/business/articleApi";
+} from "@/api/bbs/articleApi";
 import { ref } from "@vue/reactivity";
 import { computed } from "@vue/runtime-core";