房屋详情，单元变更

2026-05-21 14:13:28 +08:00
parent 9645412534
commit 38274ab612
68 changed files with 1867 additions and 568 deletions
--- a/src/components/Holder/house.vue
+++ b/src/components/Holder/house.vue
@@ -1,46 +1,67 @@
 <template>
  <slot name="default" />

-  <el-dialog append-to-body v-model="dialog.dialogVisible" :title="dialog.dialogTitle" width="1050">
+  <el-dialog append-to-body v-model="dialog.dialogVisible" :title="dialog.dialogTitle" width="1250">
    <nav class="flex flex-items-center mb-8">
-      <div class="flex flex-items-center">
+      <!-- <div class="flex flex-items-center">
        <div style="width: 70px; text-align: right; padding-right: 10px">房屋类型</div>
        <div class="flex-1">
-          <el-select @change="handleChangeHouse" style="width: 140px" v-model="queryParams.buildingUse">
-            <el-option v-for="(item, index) in com_build_use" :key="index" :label="item.label" :value="item.value"></el-option>
+          <el-select @change="handleChangeHouse" style="width: 140px" v-model="queryParams.houseUseTypeId">
+            <el-option v-for="(item, index) in houseUseTypeList" :key="index" :label="item.name" :value="item.id"></el-option>
          </el-select>
        </div>
-      </div>
+      </div> -->
      <div class="flex flex-items-center">
-        <div style="width: 60px; text-align: right; padding-right: 10px">楼栋</div>
+        <div style="width: 50px; text-align: right; padding-right: 10px">楼栋</div>
        <div class="flex-1"></div>
-        <el-select @change="handleChangebuilding" style="width: 140px" v-model="queryParams.buildingId">
+        <el-select @change="handleChangebuilding" clearable style="width: 140px" v-model="queryParams.buildingId">
          <el-option v-for="(item, index) in buildinglist" :key="index" :label="item.buildingName" :value="item.id"></el-option>
        </el-select>
      </div>
      <div class="flex flex-items-center mr-20px">
-        <div style="width: 60px; text-align: right; padding-right: 10px">单元</div>
+        <div style="width: 50px; text-align: right; padding-right: 10px">单元</div>
        <div class="flex-1">
-          <el-select style="width: 140px" v-model="queryParams.unitNo">
-            <el-option v-for="(item, index) in unitlist" :key="index" :label="`${item.unitNo}单元`" :value="item.unitNo"></el-option>
+          <el-select @change="handleChangeUnit" clearable style="width: 140px" v-model="queryParams.unitNoId">
+            <el-option v-for="(item, index) in unitlist" :key="index" :label="item.unitNoName" :value="item.unitNoId"></el-option>
          </el-select>
        </div>
      </div>
+      <div class="flex flex-items-center mr-20px">
+        <div style="width: 80px; text-align: right; padding-right: 10px">房屋类型</div>
+        <div class="flex-1">
+          <el-select clearable @change="handleHouseUseChange" style="width: 140px" v-model="queryParams.houseUseTypeId">
+            <el-option v-for="(item, index) in houseUseTypeList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="flex flex-items-center mr-20px">
+        <div style="width: 80px; text-align: right; padding-right: 10px">业主名称</div>
+        <div class="flex-1">
+          <el-input clearable @clear="handleClear" v-model="queryParams.residentName" placeholder="查找业主"></el-input>
+        </div>
+      </div>
      <div>
        <el-button type="primary" @click="getlist">查询</el-button>
        <el-button @click="resetQuery">重置</el-button>
      </div>
    </nav>
-    <el-table @row-click="handleRowClick" ref="multipleTableRef" :data="tableData" border @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      @row-click="handleRowClick"
+      ref="multipleTableRef"
+      :data="tableData"
+      border
+      @selection-change="handleSelectionChange"
+    >
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="序号" align="center" width="55" type="index" />
      <el-table-column label="小区" align="center" prop="villageName" />
      <el-table-column label="楼栋" align="center" prop="buildingName" />
-      <el-table-column label="单元" align="center" prop="unitNo" />
+      <el-table-column label="单元" align="center" prop="unitNoName" />
      <el-table-column label="房间" align="center" prop="houseNo" />
      <el-table-column label="业主" align="center">
        <template #default="scope">
-          <span>{{ scope.row.userName ? scope.row.userName : '---' }}</span>
+          <span>{{ scope.row.residentName ? scope.row.residentName : '---' }}</span>
        </template>
      </el-table-column>
    </el-table>
@@ -66,18 +87,15 @@

 <script setup lang="ts">
 import { getBuildinglistAPI, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
+import { listHouseUseType } from '@/api/system/houseUse';
 import { BillHouse, listBillHouse } from '@/api/system/SdbBill';
 import { ref, watch, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';

-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
-const { com_build_use } = toRefs<any>(proxy?.useDict('com_build_use'));
+// const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
+// const { com_build_use } = toRefs<any>(proxy?.useDict('com_build_use'));

 const props = defineProps({
-  userid: {
-    type: String,
-    default: ''
-  },
  returnvalue: {
    type: String,
    default: 'houseId'
@@ -93,7 +111,9 @@ const props = defineProps({
  }
 });

-const { userid, titleName, returnvalue } = toRefs(props);
+const { titleName, returnvalue } = toRefs(props);
+
+const showids = ref([]);

 // ✅ 手动设置默认值（替代 withDefaults）
 const emit = defineEmits<{
@@ -108,9 +128,11 @@ const dialog = ref({
 const queryParams = ref({
  pageNum: 1,
  pageSize: 10,
-  buildingUse: null,
+  // houseUseTypeId: null,
  buildingId: null,
-  unitNo: null
+  unitNoId: null,
+  houseUseTypeId: null,
+  residentName: ''
 });

 const multipleTableRef = ref();
@@ -125,13 +147,12 @@ const isMultiple = computed(() => props.isMultiple ?? false);

 // 优化 handleUserSelection，避免重复查找
 const handleUserSelection = () => {
-  if (!userid.value || !tableData.value.length) return;
-
+  if (!tableData.value.length) return;
  multipleSelection.value = [];
-  if (userid.value.trim() !== '') {
-    const arr = userid.value.split(',');
+  if (showids.value.length > 0) {
+    const arr = showids.value;
    arr.forEach((item) => {
-      const target = tableData.value.find((row) => row.userId == item);
+      const target = tableData.value.find((row) => row.houseId == item);
      target && multipleSelection.value.push(target);
    });
    nextTick(() => {
@@ -146,7 +167,7 @@ const handleUserSelection = () => {
 };

 // ====================== 方法 ======================
-
+const houseUseTypeList = ref([]);
 // 获取列表
 function getlist() {
  loading.value = true;
@@ -157,7 +178,7 @@ function getlist() {
      handleUserSelection();
    })
    .catch((error) => {
-      console.error('获取用户列表失败:', error);
+      console.error('获取列表失败:', error);
    })
    .finally(() => {
      loading.value = false;
@@ -169,17 +190,35 @@ const buildinglist = ref([]);
 /** 房屋列表 */
 const unitlist = ref([]);

-/** 筛选房屋类型 */
-function handleChangeHouse(val: string) {
-  getBuildinglistAPI(val).then((res) => {
+/** 获取楼栋 列表 */
+function handleChangeHouse() {
+  getBuildinglistAPI().then((res) => {
    buildinglist.value = res.data;
  });
 }
+
+function handleClear() {
+  queryParams.value.residentName = '';
+  getlist();
+}
+function handleHouseUseChange() {
+  getlist();
+}
 /** 单元列表 */
 function handleChangebuilding(val: string) {
-  getHouselistAPI(val).then((res) => {
-    unitlist.value = res.data.units;
-  });
+  queryParams.value.unitNoId = null;
+  unitlist.value = [];
+
+  if (queryParams.value.buildingId) {
+    getHouselistAPI(val).then((res) => {
+      unitlist.value = res.data.units;
+      getlist();
+    });
+  }
+  getlist();
+}
+function handleChangeUnit() {
+  getlist();
 }

 // ==============================================
@@ -221,9 +260,10 @@ function resetQuery() {
  queryParams.value = {
    pageNum: 1,
    pageSize: 10,
-    buildingUse: null,
+    houseUseTypeId: null,
    buildingId: null,
-    unitNo: null
+    unitNoId: null,
+    residentName: ''
  };
  getlist();
 }
@@ -267,9 +307,18 @@ function confirm() {
 }

 defineExpose({
-  open: () => {
+  open: (showidArray: string[] = []) => {
+    showids.value = showidArray;
    getlist();
    dialog.value.dialogVisible = true;
+
+    listHouseUseType({
+      pageNum: 1,
+      pageSize: 99999
+    }).then((res) => {
+      houseUseTypeList.value = res.rows;
+    });
+    handleChangeHouse();
  }
 });
 </script>
--- a/src/components/Holder/user.vue
+++ b/src/components/Holder/user.vue
@@ -39,26 +39,21 @@
 </template>

 <script setup lang="ts">
-import { getBuildinglistAPI, getBuildingOnly, getHouselistAPI } from '@/api/system/house';
-import { BillHouse, listBillHouse, queryResidentList_holder } from '@/api/system/SdbBill';
-import { ref, watch, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
+import { getBuildinglistAPI, getHouselistAPI } from '@/api/system/house';
+import { BillUserlist, queryResidentList_holder } from '@/api/system/SdbBill';
+import { ref, nextTick, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
-const { com_build_use } = toRefs<any>(proxy?.useDict('com_build_use'));

 const props = defineProps({
-  userid: {
-    type: String || Array<string>,
-    default: ''
-  },
  returnvalue: {
    type: String,
    default: 'houseId'
  },
  titleName: {
    type: String,
-    default: '选择房屋'
+    default: '选择业主'
  },
  /** 是否多选 false 单选   */
  isMultiple: {
@@ -67,11 +62,12 @@ const props = defineProps({
  }
 });

-const { userid, titleName, returnvalue } = toRefs(props);
+const { titleName, returnvalue } = toRefs(props);

+const userid = ref([]);
 // ✅ 手动设置默认值（替代 withDefaults）
 const emit = defineEmits<{
-  change: [value: string | number | (string | number)[] | BillHouse | BillHouse[]]; // 支持返回数组
+  change: [value: string | number | (string | number)[] | BillUserlist | BillUserlist[]]; // 支持返回数组
 }>();

 const dialog = ref({
@@ -85,29 +81,24 @@ const queryParams = ref({
 });

 const multipleTableRef = ref();
-const tableData = ref<BillHouse[]>([]);
+const tableData = ref<BillUserlist[]>([]);
 const total = ref(0);
 const loading = ref(false);

 // 存储选中项
-const multipleSelection = ref<BillHouse[]>([]);
+const multipleSelection = ref<BillUserlist[]>([]);

 const isMultiple = computed(() => props.isMultiple ?? false);

 // 优化 handleUserSelection，避免重复查找
 const handleUserSelection = () => {
-  if (!userid.value || !tableData.value.length) return;
+  if (!tableData.value.length) return;

  multipleSelection.value = [];
-  let arr = [];
-  if (userid.value && typeof userid.value === 'string' && userid.value.trim() !== '') {
-    arr = userid.value.split(',');
-  } else if (Array.isArray(userid.value)) {
-    arr = [...userid.value];
-  }
+  const arr = userid.value;
  if (!arr.length) return;
  arr.forEach((item) => {
-    const target = tableData.value.find((row) => row.userId == item);
+    const target = tableData.value.find((row) => row.residentId == item);
    target && multipleSelection.value.push(target);
  });
  nextTick(() => {
@@ -146,7 +137,7 @@ const unitlist = ref([]);

 /** 筛选房屋类型 */
 function handleChangeHouse(val: string) {
-  getBuildinglistAPI(val).then((res) => {
+  getBuildinglistAPI().then((res) => {
    buildinglist.value = res.data;
  });
 }
@@ -160,7 +151,7 @@ function handleChangebuilding(val: string) {
 // ==============================================
 // ✅ 新增：处理 selection-change（多选专用）
 // ==============================================
-function handleSelectionChange(selection: BillHouse[]) {
+function handleSelectionChange(selection: BillUserlist[]) {
  if (isMultiple.value) {
    multipleSelection.value = selection;
  }
@@ -169,11 +160,11 @@ function handleSelectionChange(selection: BillHouse[]) {
 // 最佳单选方案：点击行选中，无报错、无循环、最稳定
 // ==============================================
 // 优化 handleRowClick，避免重复
-function handleRowClick(row: BillHouse) {
+function handleRowClick(row: BillUserlist) {
  if (!multipleTableRef.value) return;

  if (isMultiple.value) {
-    const index = multipleSelection.value.findIndex((item) => item.houseId === row.houseId);
+    const index = multipleSelection.value.findIndex((item) => item.residentId === row.residentId);
    if (index > -1) {
      // 取消选中
      multipleSelection.value.splice(index, 1);
@@ -220,7 +211,7 @@ function confirm() {
      // 返回指定字段数组
      emit(
        'change',
-        multipleSelection.value.map((item) => item[returnvalue.value as keyof BillHouse])
+        multipleSelection.value.map((item) => item[returnvalue.value as keyof BillUserlist])
      );
    }
  } else {
@@ -230,7 +221,7 @@ function confirm() {
      emit('change', multipleSelection.value[0]);
    } else {
      // 返回指定字段
-      emit('change', multipleSelection.value[0][returnvalue.value as keyof BillHouse]);
+      emit('change', multipleSelection.value[0][returnvalue.value as keyof BillUserlist]);
    }
  }

@@ -239,7 +230,8 @@ function confirm() {
 }

 defineExpose({
-  open: () => {
+  open: (arr: string[] = []) => {
+    userid.value = arr;
    getlist();
    dialog.value.dialogVisible = true;
  }
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -22,7 +22,7 @@ const props = defineProps({
  total: propTypes.number,
  page: propTypes.number.def(1),
  limit: propTypes.number.def(20),
-  pageSizes: { type: Array<number>, default: () => [10, 20, 30, 50] },
+  pageSizes: { type: Array<number>, default: () => [10, 20, 30, 50, 100] },
  // 移动端页码按钮的数量端默认值5
  pagerCount: propTypes.number.def(document.body.clientWidth < 992 ? 5 : 7),
  layout: propTypes.string.def('total, sizes, prev, pager, next, jumper'),
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -152,7 +152,7 @@ import {
  currentTaskAllUser,
  getNextNodeList
 } from '@/api/workflow/task';
-import UserSelect from '@/components/UserSelect.vue';
+import UserSelect from '@/components/UserSelect/index.vue';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { FlowCopyVo, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';