解决协会提出的bug

xiaoqiu
.env.development
src/components/PanelGropuTotal/index.vue
src/components/PanelGroup/index.vue
src/views/index.vue
src/views/system/dept/index.vue
src/views/system/user/index.vue
--- a/.env.development
查看文件 @605476c
+++ b/.env.development
查看文件 @605476c
@@ -8,4 +8,4 @@ VITE_APP_ENV = 'development'
 VITE_APP_BASE_API = '/dev-api'
 # 开打新的tab的url前缀
-VITE_APP_TAB_URL_PREFIX = 'https://bxcxhd.gxbx.com.cn'
+VITE_APP_TAB_URL_PREFIX = 'http://192.168.2.152:6512'
--- a/src/components/PanelGropuTotal/index.vue 0 → 100644
查看文件 @605476c
+++ b/src/components/PanelGropuTotal/index.vue 0 → 100644
查看文件 @605476c
+<template>
+  <el-row :gutter="40" class="panel-group">
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon icon-class="notaccepted" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">待处理（个人车险）</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalList[0]"
+            :duration="2600"
+            class="card-panel-num"
+          />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('messages')">
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon icon-class="undertaken" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">已处理（个人车险）</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalList[1]"
+            :duration="3000"
+            class="card-panel-num"
+          />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon icon-class="incomplete" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">待处理（企业车险）</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalList[2]"
+            :duration="3200"
+            class="card-panel-num"
+          />
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="success" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">已处理（企业车险）</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalList[3]"
+            :duration="3600"
+            class="card-panel-num"
+          />
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script setup>
+import { CountTo } from "vue3-count-to";
+defineProps({
+  totalList: {
+    type: Object,
+    default: () => {},
+  },
+});
+
+const $emit = defineEmits(["handleSetLineChartData"]);
+const handleSetLineChartData = (type) => {
+  $emit("handleSetLineChartData", type);
+};
+</script>
+
+<style lang="scss" scoped>
+.panel-group {
+  margin-top: 18px;
+
+  .card-panel-col {
+    margin-bottom: 32px;
+  }
+
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05);
+    border-color: rgba(0, 0, 0, 0.05);
+
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+
+      .icon-people {
+        background: #7f36fe;
+      }
+
+      .icon-message {
+        background: #36a3f7;
+      }
+
+      .icon-money {
+        background: #f4516c;
+      }
+
+      .icon-shopping {
+        background: #34bfa3;
+      }
+    }
+
+    .icon-people {
+      color: #7f36fe;
+    }
+
+    .icon-message {
+      color: #36a3f7;
+    }
+
+    .icon-money {
+      color: #f4516c;
+    }
+
+    .icon-shopping {
+      color: #34bfa3;
+    }
+
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+
+@media (max-width: 550px) {
+  .card-panel-description {
+    display: none;
+  }
+
+  .card-panel-icon-wrapper {
+    float: none !important;
+    width: 100%;
+    height: 100%;
+    margin: 0 !important;
+
+    .svg-icon {
+      display: block;
+      margin: 14px auto !important;
+      float: none !important;
+    }
+  }
+}
+</style>
--- a/src/components/PanelGroup/index.vue
查看文件 @605476c
+++ b/src/components/PanelGroup/index.vue
查看文件 @605476c
@@ -6,7 +6,9 @@
           <svg-icon icon-class="notaccepted" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">未承接</div>
+          <div class="card-panel-text">
+            {{ type === 0 ? "未承接" : "待处理个人" }}
+          </div>
           <count-to
             :start-val="0"
             :end-val="totalList[0]"
@@ -22,7 +24,15 @@
           <svg-icon icon-class="undertaken" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">已承接</div>
+          <div class="card-panel-text">
+            {{
+              type === 0
+                ? "已承接"
+                : companyemployee
+                ? "已完成个人"
+                : "已处理个人"
+            }}
+          </div>
           <count-to
             :start-val="0"
             :end-val="totalList[1]"
@@ -38,7 +48,9 @@
           <svg-icon icon-class="incomplete" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">未完成</div>
+          <div class="card-panel-text">
+            {{ type == 0 ? "未完成" : "待处理企业" }}
+          </div>
           <count-to
             :start-val="0"
             :end-val="totalList[2]"
@@ -54,7 +66,15 @@
           <svg-icon icon-class="success" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">已完成</div>
+          <div class="card-panel-text">
+            {{
+              type == 0
+                ? "已完成"
+                : companyemployee
+                ? "已完成企业"
+                : "已处理企业"
+            }}
+          </div>
           <count-to
             :start-val="0"
             :end-val="totalList[3]"
@@ -68,17 +88,37 @@
 </template>
 <script setup>
+import { useRouter } from "vue-router";
 import { CountTo } from "vue3-count-to";
-defineProps({
+const props = defineProps({
   totalList: {
     type: Object,
     default: () => {},
   },
+  type: {
+    type: Number,
+    default: 0,
+  },
+  companyemployee: {
+    type: Boolean,
+    default: false,
+  },
 });
-
-const $emit = defineEmits(["handleSetLineChartData"]);
-const handleSetLineChartData = (type) => {
-  $emit("handleSetLineChartData", type);
+const router = useRouter();
+const handleSetLineChartData = (typeValue) => {
+  let obj = {
+    newVisitis: "/policy/pending",
+    messages: props.companyemployee ? "/policy/ended" : "/policy/processed",
+    purchases: "/buinessPolicy/businessPending",
+    shoppings: props.companyemployee
+      ? "/buinessPolicy/businessEnded"
+      : "/buinessPolicy/businessProcessed",
+  };
+  if (props.type !== 0) {
+    router.push({
+      path: obj[typeValue],
+    });
+  }
 };
 </script>
--- a/src/views/index.vue
查看文件 @605476c
+++ b/src/views/index.vue
查看文件 @605476c
@@ -46,7 +46,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="18" :xs="24">
+      <el-col v-if="checkRole(['admin', 'companyadmin'])" :span="18" :xs="24">
         <!-- 个人车险 -->
         <div style="font-weight: 500">{{ peopleCompany }}个人车险统计</div>
         <div
@@ -115,21 +115,36 @@
           <div ref="chartRef" style="width: 100%; height: 400px"></div>
         </div>
       </el-col>
+      <el-col v-else :span="18" :xs="24">
+        <PanelGroup
+          :totalList="PanelGroupList"
+          :type="1"
+          :companyemployee="checkRole(['companyemployee'])"
+        />
+      </el-col>
     </el-row>
   </div>
 </template>
 <script setup>
+import { queryMyList, queryProcessedList, queryEndedList } from "@/api/policy";
 import useUserStore from "@/store/modules/user";
 import { getUserProfile } from "@/api/system/user";
 import { getStatistics } from "@/api/index";
 import PanelGroup from "@/components/PanelGroup";
 import { listDept } from "@/api/system/dept";
 import { onMounted } from "vue";
+import { checkRole } from "@/utils/permission"; // 权限判断函数
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
 const chartRef = ref(null);
 const listData = ref([]);
+const PanelGroupList = ref({
+  0: 0,
+  1: 0,
+  2: 0,
+  3: 0,
+});
 const peopleTotalList = ref({
   0: 0,
   1: 0,
@@ -152,7 +167,7 @@ const deptOptions = ref([]);
 const queryParamsPeople = reactive({
   deptIds: [""],
   type: 1,
-  registrationType: 0,
+  registrationType: "0",
   startTime: proxy.parseTime(
     new Date().setFullYear(new Date().getFullYear() - 1)
   ),
@@ -162,7 +177,7 @@ const queryParamsPeople = reactive({
 const queryParamsBusiness = reactive({
   deptIds: [""],
   type: 1,
-  registrationType: 1,
+  registrationType: "1",
   startTime: proxy.parseTime(
     new Date().setFullYear(new Date().getFullYear() - 1)
   ),
@@ -184,12 +199,16 @@ const state = reactive({
 });
 onMounted(() => {
-  getList();
-  getPeopleList();
-  getBusinessList();
-  if (proxy.$auth.hasRoleOr(["admin", "associationemployee"])) {
+  if (proxy.$auth.hasRoleOr(["admin"])) {
     getDeptList();
   }
+  if (proxy.$auth.hasRoleOr(["admin", "companyadmin"])) {
+    getList();
+    getPeopleList();
+    getBusinessList();
+  } else {
+    getAllList();
+  }
 });
 /** 查询部门列表 */
@@ -247,6 +266,35 @@ const getList = async () => {
   init();
 };
+// 获取员工统计数据
+const getAllList = async () => {
+  if (proxy.$auth.hasRoleOr(["associationemployee"])) {
+    const [personData, companyData, personProcessedData, companyProcessedData] =
+      await Promise.all([
+        queryMyList({ pageNum: 1, pageSize: 1, type: 0 }),
+        queryMyList({ pageNum: 1, pageSize: 1, type: 1 }),
+        queryProcessedList({ pageNum: 1, pageSize: 1, type: 0 }),
+        queryProcessedList({ pageNum: 1, pageSize: 1, type: 1 }),
+      ]);
+    PanelGroupList.value[0] = personData.data.total;
+    PanelGroupList.value[1] = personProcessedData.total;
+    PanelGroupList.value[2] = companyData.data.total;
+    PanelGroupList.value[3] = companyProcessedData.total;
+  } else if (proxy.$auth.hasRoleOr(["companyemployee"])) {
+    const [personData, companyData, personProcessedData, companyProcessedData] =
+      await Promise.all([
+        queryMyList({ pageNum: 1, pageSize: 1, type: 0 }),
+        queryMyList({ pageNum: 1, pageSize: 1, type: 1 }),
+        queryEndedList({ pageNum: 1, pageSize: 1, type: 0 }),
+        queryEndedList({ pageNum: 1, pageSize: 1, type: 1 }),
+      ]);
+    PanelGroupList.value[0] = personData.data.total;
+    PanelGroupList.value[1] = personProcessedData.total;
+    PanelGroupList.value[2] = companyData.data.total;
+    PanelGroupList.value[3] = companyProcessedData.total;
+  }
+};
+
 // 获个人车险统计
 const getPeopleList = async () => {
   peopleTotalList.value = {
@@ -265,6 +313,7 @@ const getPeopleList = async () => {
       item.completed,
     ];
   });
+  console.log(newArr);
   const arrList = [[], [], [], []];
   for (let i = 0; i < 4; i++) {
     for (let j = 0; j < 13; j++) {
@@ -272,6 +321,7 @@ const getPeopleList = async () => {
       peopleTotalList.value[i] += newArr[j][i];
     }
   }
+  console.log(peopleTotalList.value);
   peopleCompany.value = data[0]?.statisticsVo[0]?.deptName;
 };
--- a/src/views/system/dept/index.vue
查看文件 @605476c
+++ b/src/views/system/dept/index.vue
查看文件 @605476c
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="部门名称" prop="deptName">
-            <el-input
-               v-model="queryParams.deptName"
-               placeholder="请输入部门名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="部门状态"
+          clearable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:dept:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="info"
-               plain
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:dept:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Sort" @click="toggleExpandAll"
+          >展开/折叠</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"
-         row-key="deptId"
-         :default-expand-all="isExpandAll"
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="deptList"
+      row-key="deptId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="deptName"
+        label="部门名称"
+        width="260"
+      ></el-table-column>
+      <el-table-column
+        prop="deptId"
+        label="部门编号"
+        width="80"
+      ></el-table-column>
+      <el-table-column
+        prop="orderNum"
+        label="排序"
+        width="200"
+      ></el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
       >
-         <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="status" label="状态" width="100">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+            >修改</el-button
+          >
+          <el-button
+            link
+            type="primary"
+            icon="Plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+            >新增</el-button
+          >
+          <el-button
+            v-if="scope.row.parentId != 0"
+            link
+            type="primary"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
-      <!-- 添加或修改部门对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-               <el-col :span="24" v-if="form.parentId !== 0">
-                  <el-form-item label="上级部门" prop="parentId">
-                     <el-tree-select
-                        v-model="form.parentId"
-                        :data="deptOptions"
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                        value-key="deptId"
-                        placeholder="选择上级部门"
-                        check-strictly
-                     />
-                  </el-form-item>
-               </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.status">
-                        <el-radio
-                           v-for="dict in sys_normal_disable"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+    <!-- 添加或修改部门对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{
+                  value: 'deptId',
+                  label: 'deptName',
+                  children: 'children',
+                }"
+                value-key="deptId"
+                placeholder="选择上级部门"
+                check-strictly
+              />
+            </el-form-item>
+          </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.status">
+                <el-radio
+                  v-for="dict in sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 <script setup name="Dept">
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  listDeptExcludeChild,
+} from "@/api/system/dept";
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -159,14 +244,32 @@ const data = reactive({
   form: {},
   queryParams: {
     deptName: undefined,
-    status: undefined
+    status: undefined,
   },
   rules: {
-    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" }]
+    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",
+      },
+    ],
   },
 });
@@ -175,7 +278,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询部门列表 */
 function getList() {
   loading.value = true;
-  listDept(queryParams.value).then(response => {
+  listDept(queryParams.value).then((response) => {
     deptList.value = proxy.handleTree(response.data, "deptId");
     loading.value = false;
   });
@@ -195,7 +298,7 @@ function reset() {
     leader: undefined,
     phone: undefined,
     email: undefined,
-    status: "0"
+    status: "0",
   };
   proxy.resetForm("deptRef");
 }
@@ -211,7 +314,7 @@ function resetQuery() {
 /** 新增按钮操作 */
 function handleAdd(row) {
   reset();
-  listDept().then(response => {
+  listDept().then((response) => {
     deptOptions.value = proxy.handleTree(response.data, "deptId");
   });
   if (row != undefined) {
@@ -231,10 +334,10 @@ function toggleExpandAll() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  listDeptExcludeChild(row.deptId).then(response => {
+  listDeptExcludeChild(row.deptId).then((response) => {
     deptOptions.value = proxy.handleTree(response.data, "deptId");
   });
-  getDept(row.deptId).then(response => {
+  getDept(row.deptId).then((response) => {
     form.value = response.data;
     open.value = true;
     title.value = "修改部门";
@@ -242,16 +345,16 @@ function handleUpdate(row) {
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["deptRef"].validate(valid => {
+  proxy.$refs["deptRef"].validate((valid) => {
     if (valid) {
       if (form.value.deptId != undefined) {
-        updateDept(form.value).then(response => {
+        updateDept(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addDept(form.value).then(response => {
+        addDept(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -262,12 +365,16 @@ function submitForm() {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
-    return delDept(row.deptId);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认删除名称为"' + row.deptName + '"的数据项?')
+    .then(function () {
+      return delDept(row.deptId);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 getList();
--- a/src/views/system/user/index.vue
查看文件 @605476c
+++ b/src/views/system/user/index.vue
查看文件 @605476c
@@ -153,10 +153,10 @@
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
-            label="用户编号"
+            label="序号"
             align="center"
-            key="userId"
-            prop="userId"
+            type="index"
+            width="55"
             v-if="columns[0].visible"
           />
           <el-table-column
@@ -393,7 +393,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
+            <el-form-item label="岗位" prop="postIds">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in postOptions"
@@ -406,7 +406,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in roleOptions"
@@ -572,6 +572,9 @@ const data = reactive({
     nickName: [
       { required: true, message: "用户姓名不能为空", trigger: "blur" },
     ],
+    deptId: [{ required: true, message: "部门不能为空", trigger: "change" }],
+    roleIds: [{ required: true, message: "角色不能为空", trigger: "change" }],
+    postIds: [{ required: true, message: "岗位不能为空", trigger: "change" }],
     password: [
       { required: true, message: "用户密码不能为空", trigger: "blur" },
       {
@@ -589,6 +592,7 @@ const data = reactive({
       },
     ],
     phonenumber: [
+      { required: true, message: "手机号不能为空", trigger: "blur" },
       {
         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
         message: "请输入正确的手机号码",