补助页面修改(选择，加下拉条件) - 增加了排除部门的条件

src/api/payment/account/types.ts

@@ -507,4 +507,7 @@ export interface PtUserAccountQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  excludeDepts?: Array<string | number>;
+  excludeDeptsAndChildren?: Array<string | number>;
 }

src/components/UserAccountSelect/index.vue

@@ -29,21 +29,39 @@
             <template #header>
               <div><span class="text-red-500 font-bold">待选用户</span></div>
             </template>
-            <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="pt-2 pb-2">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="pt-2">
               <el-form-item label="姓名" prop="realName" style="width: 25%">
                 <el-input v-model="queryParams.realName" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item label="学/工号" prop="userNumb" style="width: 30%">
+              <el-form-item label="学/工号" prop="userNumb" style="width: 25%">
                 <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <!-- <el-form-item label="手机号码" prop="phone" style="width: 20%">
-                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                </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 label="排除部门" prop="phone" style="width: 35%" label-width="6rem">
+                <template #label>
+                  排除部门
+                  <el-tooltip content="查询列表中将排除所选部门及子部门下的所有用户" placement="top">
+                    <el-icon>
+                      <question-filled />
+                    </el-icon>
+                  </el-tooltip>
+                </template>
+                <el-select
+                  v-model="queryParams.excludeDepts"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  :max-collapse-tags="1"
+                  placeholder="请选择需要排除的部门"
+                >
+                  <el-option v-for="item in childrenOptions" :key="item.id" :label="item.label" :value="item.id" />
+                </el-select>
+                <!-- <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" /> -->
               </el-form-item>
             </el-form>
+            <div class="flex justify-end mb-2">
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </div>
 
             <vxe-table
               ref="table1"
@@ -149,6 +167,7 @@ import { DeptVO } from '@/api/system/dept/types';
 import { get } from 'http';
 import { ref } from 'vue';
 import { useDraggable } from 'vue-draggable-plus';
+import { de } from 'element-plus/es/locale/index.mjs';
 
 const table1 = ref();
 const tbody1 = ref<HTMLTableSectionElement>();
@@ -165,6 +184,7 @@ const ids2 = ref<Array<string | number>>([]);
 const selected2 = ref<PtUserAccountVO[]>([]);
 
 const deptOptions = ref<DeptVO[]>([]);
+const childrenOptions = ref<DeptVO[]>([]);
 const deptName = ref('');
 const expandKeys = ref<number[]>([]);
 const initFormData: PtUserAccountForm = {
@@ -204,6 +224,8 @@ const initData: PageData<PtUserAccountForm, PtUserAccountQuery> = {
     realName: '',
     userNumb: '',
     phone: '',
+    excludeDepts: [],
+    excludeDeptsAndChildren: [],
     category: '1'
   },
   rules: {}
@@ -296,16 +318,61 @@ const filterNode = (value: string, data: any) => {
 
 /** 节点单击事件 */
 const handleNodeClick = (data: DeptVO) => {
+  if (queryParams.value.deptId && data.id !== queryParams.value.deptId) {
+    // 重新选择不同部门时清空
+    queryParams.value.excludeDepts = [];
+  }
   queryParams.value.deptId = data.id;
+  childrenOptions.value = data.children;
   handleQuery();
 };
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
+  queryParams.value.excludeDeptsAndChildren = [];
+  if (queryParams.value.excludeDepts && queryParams.value.excludeDepts.length > 0) {
+    // 查询所有子部门的id
+    queryParams.value.excludeDepts.forEach((item: string | number) => {
+      queryParams.value.excludeDeptsAndChildren.push(...getAllChildrenIds(deptOptions.value, item));
+    });
+    // queryParams.value.excludeDeptsAndChildren.push(...queryParams.value.excludeDepts);
+  }
+  console.log(queryParams.value.excludeDeptsAndChildren, 'excludeDeptsAndChildren');
   getList();
 };
 
+// 查询所有子部门的id
+const getAllChildrenIds = (departments, id: number | string) => {
+  const ids: Array<number | string> = [];
+  if (departments instanceof Array) {
+  } else {
+    departments = [departments];
+  }
+  for (let item of departments) {
+    if (id === 'all') {
+      // 直接将其下的所有部门都添加到ids中
+      ids.push(item.id);
+      if (item.children && item.children.length > 0) {
+        ids.push(...getAllChildrenIds(item.children, 'all'));
+      }
+    } else {
+      if (item.id === id) {
+        ids.push(item.id);
+        if (item.children && item.children.length > 0) {
+          ids.push(...getAllChildrenIds(item.children, 'all'));
+        }
+        return ids;
+      } else {
+        if (item.children && item.children.length > 0) {
+          ids.push(...getAllChildrenIds(item.children, id));
+        }
+      }
+    }
+  }
+  return ids;
+};
+
 /** 查询用户列表 */
 const getList = async () => {
   loading.value = true;
@@ -335,6 +402,8 @@ const resetQuery = () => {
   queryParams.value.deptId = undefined;
   queryParams.value.category = '1';
   deptTreeRef.value?.setCurrentKey(undefined);
+  queryParams.value.excludeDepts = [];
+  childrenOptions.value = deptOptions.value[0].children;
   handleQuery();
 };
 
@@ -343,6 +412,7 @@ const getTreeSelect = async () => {
   deptLoading.value = true;
   const res = await api.deptTreeSelect();
   deptOptions.value = res.data;
+  childrenOptions.value = deptOptions.value[0].children;
   expandKeys.value = [deptOptions.value[0].id as number];
   deptLoading.value = false;
 };

src/views/cardCenter/subsidy/ptSubsidy/DetailForm.vue

@@ -1,71 +1,72 @@
 <template>
   <div class="p-2">
     <el-dialog v-model="dialog.visible" :title="dialog.title" width="1200px" :draggable="draggable">
-      <el-form ref="formRef" :inline="true" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
+      <el-form ref="formRef" v-loading="formLoading" :inline="true" :model="formData" :rules="formRules" label-width="110px">
         <el-form-item label="补助名称" prop="subsidyName">
           <el-input v-model="formData.subsidyName" placeholder="请输入补助名称" />
         </el-form-item>
         <el-form-item label="补助类型" prop="subsidyType">
           <el-select v-model="formData.subsidyType" placeholder="请选择补助类型">
-            <el-option
-                v-for="dict in SUBTYPE"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in SUBTYPE" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="补助金额" prop="fillMoney">
           <el-input v-model="formData.fillMoney" placeholder="请输入补助金额" />
         </el-form-item>
-        <el-form-item label="预计到账时间" prop="fillDate" label-width="108px">
+        <el-form-item label="预计到账时间" prop="fillDate" label-width="120px">
           <el-date-picker v-model="formData.fillDate" clearable type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择预计到账时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="入账钱包" prop="bagCode">
           <el-select v-model="formData.bagCode" placeholder="请选择入账钱包">
-            <el-option
-                v-for="dict in CARDBAGTYPE"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
+            <el-option v-for="dict in CARDBAGTYPE" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="补助说明" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入补助说明" />
         </el-form-item>
       </el-form>
-      <el-divider/>
+      <el-divider />
 
       <el-form ref="queryFormRef" :model="itemQuery" :inline="true" label-width="80px" class="-mb-15px">
-          <el-form-item label="人员名称" prop="realName">
-            <el-input v-model="itemQuery.realName" placeholder="请输入人员姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="部门名称" prop="deptName">
-            <el-input v-model="itemQuery.deptName" placeholder="请输入部门姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </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-item>
-            <el-button v-if="visible" v-hasPermi="['subsidy:ptSubsidy:add']" type="primary" plain icon="Plus" @click="openWindowDailog()">新增</el-button>
-            <el-button v-if="visible" v-hasPermi="['subsidy:ptSubsidy:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
-          </el-form-item>
+        <el-form-item label="人员名称" prop="realName">
+          <el-input v-model="itemQuery.realName" placeholder="请输入人员姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="部门名称" prop="deptName">
+          <el-input v-model="itemQuery.deptName" placeholder="请输入部门姓名" clearable style="width: 240px" @keyup.enter="handleQuery" />
+        </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-item>
+          <el-button v-if="visible" v-hasPermi="['subsidy:ptSubsidy:add']" type="primary" plain icon="Plus" @click="openWindowDailog()"
+            >新增</el-button
+          >
+          <el-button
+            v-if="visible"
+            v-hasPermi="['subsidy:ptSubsidy:remove']"
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete()"
+            >删除</el-button
+          >
+        </el-form-item>
       </el-form>
 
-      <br><br>
+      <br /><br />
       <el-table v-loading="loading" :data="formData.ptSubsidyItemList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="35" align="center" />
-        <el-table-column type="index" width="50" label="序号"/>
+        <el-table-column type="index" width="70" label="序号" />
         <el-table-column v-if="false" label="ID" align="center" prop="itemId" />
         <el-table-column v-if="false" label="mainId" align="center" prop="mainId" />
         <el-table-column label="工号" align="center" prop="userNumb" />
         <el-table-column label="姓名" align="center" prop="realName" />
         <el-table-column label="部门" align="center" prop="deptName" />
         <el-table-column label="补助金额" align="center" prop="fillMoney" />
-        <el-table-column label="到账日期" align="center" prop="fillDate" >
+        <el-table-column label="到账日期" align="center" prop="fillDate">
           <template #default="scope">
             <span>{{ parseTime(scope.row.fillDate, '{y}-{m}-{d}') }}</span>
           </template>
@@ -88,7 +89,7 @@
 import * as PtSubsidyApi from '@/api/cardCenter/subsidy/ptSubsidy';
 import * as PtSubsidyItemApi from '@/api/cardCenter/subsidy/ptSubsidyitem';
 import { PtSubsidyForm } from '@/api/cardCenter/subsidy/ptSubsidy/types';
-import { PtSubsidyitemVO} from '@/api/cardCenter/subsidy/ptSubsidyitem/types';
+import { PtSubsidyitemVO } from '@/api/cardCenter/subsidy/ptSubsidyitem/types';
 import { useI18n } from 'vue-i18n';
 
 defineOptions({ name: 'PtSubsidyForm' });
@@ -128,7 +129,7 @@ const formData = ref<PtSubsidyForm>({
   auditUser: undefined,
   auditDate: undefined,
   remark: '',
-  ptSubsidyItemList: [],
+  ptSubsidyItemList: []
 });
 // 表单校验规则
 const formRules = reactive({
@@ -137,7 +138,7 @@ const formRules = reactive({
   subsidyType: [{ required: true, message: '补助类型不能为空', trigger: 'change' }],
   fillMoney: [{ required: true, message: '补助金额不能为空', trigger: 'blur' }],
   fillDate: [{ required: true, message: '预计到账时间不能为空', trigger: 'blur' }],
-  bagCode: [{ required: true, message: '入账钱包不能为空', trigger: 'change' }],
+  bagCode: [{ required: true, message: '入账钱包不能为空', trigger: 'change' }]
 });
 
 /** 当前组件方法 */
@@ -164,7 +165,6 @@ const open = async (type: string, id?: number, isEdit?: boolean) => {
 };
 /** 表单重置 */
 const resetForm = () => {
-  
   formData.value = {
     mainId: undefined,
     subsidyName: PtSubsidyApi.getSubsidyName(),
@@ -177,7 +177,7 @@ const resetForm = () => {
     auditUser: undefined,
     auditDate: undefined,
     remark: '',
-    ptSubsidyItemList: [],
+    ptSubsidyItemList: []
   };
   formRef.value?.resetFields();
 };
@@ -190,7 +190,7 @@ const emit = defineEmits(['success']);
 /** 提交按钮 */
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return;
+  if (!formRef.value) return;
   const valid = await formRef.value?.validate();
   if (!valid) return;
   // 提交请求
@@ -225,16 +225,16 @@ const multiple = ref(true);
 const total = ref(0);
 //查询补助明细列表
 const itemQuery = reactive({
-    pageNum: 1,
-    pageSize: 10,
-    mainId: undefined,
-    realName: undefined,
-    deptName: undefined,
-    params: {}
-  });
+  pageNum: 1,
+  pageSize: 10,
+  mainId: undefined,
+  realName: undefined,
+  deptName: undefined,
+  params: {}
+});
 const getList = async () => {
   loading.value = true;
-  if(itemQuery.mainId){
+  if (itemQuery.mainId) {
     const res = await PtSubsidyItemApi.listPtSubsidyitem(itemQuery);
     formData.value.ptSubsidyItemList = res.rows;
     total.value = res.total;
@@ -275,16 +275,16 @@ import UserAccountSelect from '@/components/UserAccountSelect/index.vue';
 
 /**新增按钮弹窗 */
 const userAccountSelect = ref();
-const openWindowDailog = () =>{
+const openWindowDailog = () => {
   userAccountSelect.value.open('选择发放补助人员', formData.value.ptSubsidyItemList);
-}
+};
 
 const selectUser = (data) => {
-  formData.value.ptSubsidyItemList = data
-  console.log(formData.value.ptSubsidyItemList)
-  formData.value.ptSubsidyItemList.forEach(e => {
-    e.fillMoney = formData.value.fillMoney
-    e.fillDate = formData.value.fillDate
+  formData.value.ptSubsidyItemList = data;
+  console.log(formData.value.ptSubsidyItemList);
+  formData.value.ptSubsidyItemList.forEach((e) => {
+    e.fillMoney = formData.value.fillMoney;
+    e.fillDate = formData.value.fillDate;
   });
 };