8/25 dev 权限,sse,账单,bug

# Conflicts:
#	src/views/system/Repair/addRepairlist.vue
#	src/views/system/resident/addResident.vue
#	src/views/system/statistics/Personnel/index.vue
#	src/views/system/user/addUser.vue

.env.development

@@ -9,9 +9,9 @@ VITE_APP_ENV = 'development'
 # 开发环境
 VITE_APP_BASE_API='/dev-api'
 # # 开发环境  接口代理地址
-VITE_APP_PROXY_API = 'http://192.168.1.222:8080'
+#VITE_APP_PROXY_API='http://192.168.1.222:8080'
 # 开发环境  接口代理地址
-# VITE_APP_PROXY_API = 'http://192.168.1.215:8080'
+VITE_APP_PROXY_API='http://192.168.1.6:8080'
 # 图片基础地址
 VITE_IMG_URL='http://192.168.1.222:8080'
 
@@ -21,11 +21,28 @@ VITE_APP_CONTEXT_PATH = '/'
 # 监控地址
 VITE_APP_MONITOR_ADMIN='http://192.168.1.215/admin/applications'
 
-
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN='http://192.168.1.215/snail-job'
 
-VITE_APP_PORT = 5173
+VITE_APP_PORT=5174
+
+# 登录成功跳转地址
+# VITE_LOGIN_BACK_URL = '/equipment/WaterDevice'
+VITE_LOGIN_BACK_URL='/index'
+# 工作台正式内容:false 假内容：true
+VITE_LOGIN_BACK_URL_WORKBENCH_TRUE=false
+# 是否展示工作台
+VITE_APP_SHOW_WORK_PLATFORM=true
+
+# 地图类型  天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+VITE_APP_MAP_TYPE='GCJ02'
+
+# 高德地图key 建议放入环境变量中，避免泄露
+VITE_GCJ02_KEY_GD='8e302fe1be5f4db62bc734db23dca149'
+VITE_GCJ02_JS_CODE_GD='09534b3534d8da53968529a9ce164118'
+
+# 天地图key 建议放入环境变量中，避免泄露
+VITE_TIANDITU_KEY='f71689f9e22158947ebf64ad95e0a595'
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT=true
@@ -41,4 +58,5 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 VITE_APP_WEBSOCKET=false
 
 # sse 开关
-VITE_APP_SSE = false
+VITE_APP_SSE=true
+

.env.production

@@ -15,13 +15,29 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN='/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'https://wuyeapi.bugtc.com'
+# VITE_APP_BASE_API = 'https://wuyeapi.bugtc.com'
-# VITE_APP_BASE_API = 'http://192.168.0.222:8080'
+VITE_APP_BASE_API='https://wuyeapi.ckdzkj.com'
+#VITE_APP_BASE_API='http://192.168.1.198'
+# 登录成功跳转地址
+# VITE_LOGIN_BACK_URL = '/equipment/WaterDevice'
+VITE_LOGIN_BACK_URL='/index'
+# 工作台正式内容:false 假内容：true
+VITE_LOGIN_BACK_URL_WORKBENCH_TRUE=false
+# 是否展示工作台
+VITE_APP_SHOW_WORK_PLATFORM=true
 
+# 地图类型  天地图 WGS84 高德地图 GCJ02, 高德地图 需要在高德地图官网申请key
+VITE_APP_MAP_TYPE='GCJ02'
 
+# 高德地图key 建议放入环境变量中，避免泄露
+VITE_GCJ02_KEY_GD='8e302fe1be5f4db62bc734db23dca149'
+VITE_GCJ02_JS_CODE_GD='09534b3534d8da53968529a9ce164118'
+
+# 天地图key 建议放入环境变量中，避免泄露
+VITE_TIANDITU_KEY='f71689f9e22158947ebf64ad95e0a595'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
+# VITE_BUILD_COMPRESS = gzip
 
 VITE_APP_PORT=80
 
@@ -39,4 +55,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 VITE_APP_WEBSOCKET=false
 
 # sse 开关
-VITE_APP_SSE = false
+VITE_APP_SSE=true

.gitignore

@@ -2,6 +2,23 @@
 .history
 node_modules/
 dist/
+.env
+.git
+.idea
+.vscode
+.gitignore
+.npmrc
+.yarn
+.yarnrc
+.pnp.js
+.pnp.lock.json
+.pnp
+.yarn.lock
+.bat
+dist.zip
+.zip
+
+
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -12,8 +29,6 @@ tests/e2e/reports
 selenium-debug.log
 
 # Editor directories and files
-.idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj
@@ -27,3 +42,5 @@ pnpm-lock.yaml
 # 编译生成的文件
 auto-imports.d.ts
 components.d.ts
+
+

bin/build.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成dist文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-yarn build:prod
-
-pause

bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 安装Web工程，生成node_modules文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-yarn --registry=https://registry.npmmirror.com
-
-pause

bin/run-web.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用 Vite 命令运行 Web 工程。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-yarn dev
-
-pause

package.json

@@ -30,16 +30,18 @@
     "@vueuse/core": "14.2.1",
     "animate.css": "4.1.1",
     "await-to-js": "3.0.0",
-    "axios": "1.13.6",
+    "axios": "1.15.2",
+    "big.js": "^7.0.1",
     "crypto-js": "4.2.0",
     "echarts": "6.0.0",
     "element-china-area-data": "^6.1.0",
     "element-plus": "2.13.5",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
     "highlight.js": "11.11.1",
     "image-conversion": "2.1.1",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.5.4",
+    "jszip": "^3.10.1",
     "nprogress": "0.2.0",
     "pinia": "3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
@@ -50,16 +52,20 @@
     "vue-json-pretty": "2.6.0",
     "vue-router": "5.0.3",
     "vue-types": "6.0.0",
+    "vue3-print-nb": "^0.1.4",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "4.18.1"
+    "vxe-table": "4.18.1",
+    "xlsx-js-style": "^1.2.0"
   },
   "devDependencies": {
     "@iconify/json": "^2.2.448",
+    "@types/big.js": "^7.0.0",
     "@types/crypto-js": "4.2.2",
-    "@types/file-saver": "2.0.7",
+    "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "3.0.6",
     "@types/node": "^25.4.0",
     "@types/nprogress": "0.2.3",
+    "@types/xlsx": "^0.0.35",
     "@unocss/preset-attributify": "66.6.6",
     "@unocss/preset-icons": "66.6.6",
     "@unocss/preset-uno": "66.6.6",
@@ -82,9 +88,10 @@
     "unplugin-icons": "23.0.1",
     "unplugin-vue-components": "31.0.0",
     "unplugin-vue-setup-extend-plus": "1.0.1",
-    "vite": "7.3.1",
+    "vite": "8.0.5",
     "vite-plugin-svg-icons-ng": "^1.5.2",
     "vite-plugin-vue-devtools": "8.0.7",
+    "vite-plugin-zip-pack": "^1.2.4",
     "vitest": "4.0.18",
     "vue-tsc": "^3.2.5"
   },

postcss.config.js

@@ -1,6 +1,6 @@
 export default {
   plugins: {
-    autoprefixer: {},
+    // autoprefixer: {},
     'postcss-pxtorem': {
       rootValue: 16, // 基准根节点字体大小
       propList: ['*'], // 所有属性都转换

src/App.vue

@@ -8,7 +8,6 @@
 import { useSettingsStore } from '@/store/modules/settings';
 import { handleThemeStyle } from '@/utils/theme';
 import { useAppStore } from '@/store/modules/app';
-import { useDictStore } from './store/modules/dict';
 
 const appStore = useAppStore();
 onMounted(() => {

src/api/login.ts

@@ -80,7 +80,7 @@ export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
 /**
  * 第三方登录
  */
-export function callback(data: LoginData): AxiosPromise<any> {
+export function callback(data: LoginData) {
   const LoginData = {
     ...data,
     clientId: clientId,

src/api/system/Activity/type.ts

@@ -1,38 +1,26 @@
 export interface ActivityVO {
-  /**
+  'id': string;
-   * 活动管理表id
+  'villageId': string;
-   */
+  'title': string;
-  id: string | number;
+  'author': string;
-
+  'content': string;
-  /**
+  'status': string;
-   * 标题
+  'pageViews': number;
-   */
+  'createName': string;
-  title: string;
+  'coverImage': string;
-
+  'startTime': string;
-  /**
+  'endTime': string;
-   * 作者
+  'applyDeadline': string;
-   */
+  'signinStartTime': string;
-  author: string;
+  'signinEndTime': string;
-
+  'address': string;
-  /**
+  'quota': number;
-   * 内容
+  'appliedCount': number;
-   */
+  'organizer': string;
-  content: string;
+  'contactName': string;
-
+  'contactPhone': string;
-  /**
+  'pointsReward': number;
-   * 发布状态 0未发布 1已发布
+  'requirements': string;
-   */
-  status: string;
-
-  /**
-   * 浏览量
-   */
-  pageViews: number;
-
-  /**
-   * 创建者姓名
-   */
-  createName: string;
 }
 
 export interface ActivityForm extends BaseEntity {

src/api/system/Banner/index.ts

@@ -61,3 +61,19 @@ export const delBanner = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+/**
+ * 改变Banner图管理 状态
+ * @param id
+ * @param status
+ */
+export const switchBanner = (id: string, status: string) => {
+  return request({
+    url: '/banner/changeStatus',
+    method: 'GET',
+    params: {
+      id,
+      status
+    }
+  });
+};

src/api/system/Banner/type.ts

@@ -17,9 +17,9 @@ export interface BannerVO {
   /**
    * 排序
    */
-  order: number;
   url: string;
-  jump_link: string;
+  byOrder: number;
+  link: string;
   /**
    * 小区id
    */
@@ -45,12 +45,8 @@ export interface BannerForm extends BaseEntity {
   /**
    * 排序
    */
-  order?: number;
+  byOrder?: number;
-
+  link: string;
-  /**
-   * 小区id
-   */
-  villageId?: string;
 }
 
 export interface BannerQuery extends PageQuery {
@@ -67,8 +63,8 @@ export interface BannerQuery extends PageQuery {
   /**
    * 排序
    */
-  order?: number;
+  byOrder: number;
-
+  link: string;
   /**
    * 小区id
    */

src/api/system/ChargeType/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ChargeTypeVO, ChargeTypeForm, ChargeTypeQuery } from './type';
+import { ChargeTypeVO, ChargeTypeForm, ChargeTypeQuery, ChargeTypeRelationQuery } from './type';
 
 /**
  * 查询收费类型列表
@@ -61,3 +61,37 @@ export const delChargeType = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+/**
+ * 查询收费类型关联列表
+ * @param query
+ */
+export const getChargeTypeRelation = (query?: ChargeTypeRelationQuery) => {
+  return request({
+    url: '/chargeType/relation/list',
+    method: 'get'
+  });
+};
+
+/**
+ * 新增收费类型关联
+ * @param data
+ */
+export const addChargeTypeRelation = (data: ChargeTypeRelationQuery) => {
+  return request({
+    url: '/chargeType/relation',
+    method: 'POST',
+    data: data
+  });
+};
+/**
+ * 新增收费类型关联
+ * @param data
+ */
+export const editChargeTypeRelation = (data: ChargeTypeRelationQuery) => {
+  return request({
+    url: '/chargeType/relation',
+    method: 'PUT',
+    data: data
+  });
+};

src/api/system/ChargeType/type.ts

@@ -2,7 +2,7 @@ export interface ChargeTypeVO {
   /**
    * 收费类型表id
    */
-  id: string | number;
+  id: string;
 
   /**
    * 收费类型名称
@@ -64,3 +64,20 @@ export interface ChargeType2Query extends PageQuery {
    */
   params?: any;
 }
+
+
+
+
+export interface  ChargeTypeRelationQuery {
+  /**
+   * 主收费类型表id
+   */
+  masterTypeId?: string;
+  /**
+   * 子收费类型表id
+   */
+  slaveTypeIds?: string;
+  id?: string;
+  // 状态 0启用 1停用
+  status?: string;
+}

src/api/system/ComplainType/type.ts

@@ -2,7 +2,7 @@ export interface ComplaintTypeVO {
   /**
    * 投诉类型管理表id
    */
-  id: string | number;
+  id: string;
 
   /**
    * 投诉类型名称
@@ -13,43 +13,21 @@ export interface ComplaintTypeVO {
    * 状态 0 启用 1停用
    */
   status: string;
-
-  /**
-   * 创建人名称
-   */
-  createNam: string;
-
-  /**
-   * 创建时间
-   */
-  creaateTime: string;
 }
 
 export interface ComplaintTypeForm extends BaseEntity {
   /**
    * 投诉类型管理表id
    */
-  id?: string | number;
+  id?: string;
-
-  /**
-   * 投诉类型名称
-   */
-  name?: string;
-
   /**
    * 状态 0 启用 1停用
    */
   status?: string;
-
   /**
-   * 创建人名称
+   * 投诉类型名称
    */
-  createNam?: string;
+  name?: string;
-
-  /**
-   * 创建时间
-   */
-  creaateTime?: string;
 }
 
 export interface ComplaintTypeQuery extends PageQuery {
@@ -62,19 +40,4 @@ export interface ComplaintTypeQuery extends PageQuery {
    * 状态 0 启用 1停用
    */
   status?: string;
-
-  /**
-   * 创建人名称
-   */
-  createNam?: string;
-
-  /**
-   * 创建时间
-   */
-  creaateTime?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
 }

src/api/system/Complaint/index.ts

@@ -20,7 +20,7 @@ export const listComplaint = (query?: ComplaintQuery): AxiosPromise<ComplaintVO[
  * 查询投诉管理详细
  * @param id
  */
-export const getComplaint = (id: string | number): AxiosPromise<ComplaintVO> => {
+export const getComplaint = (id: string): AxiosPromise<ComplaintVO> => {
   return request({
     url: '/complaint/' + id,
     method: 'get'

src/api/system/Complaint/type.ts

@@ -30,7 +30,7 @@ export interface ComplaintVO {
   problemIamgeUrl: string;
 
   /**
-   * 投诉状态 0待处理 1处理中 2已处理
+   * 投诉状态 0 待处理 1 已处理
    */
   status: string;
 
@@ -48,6 +48,8 @@ export interface ComplaintVO {
    * 处理描述
    */
   handleContent: string;
+
+  problemImageUrl: string;
 }
 
 export interface ComplaintForm extends BaseEntity {
@@ -79,7 +81,7 @@ export interface ComplaintForm extends BaseEntity {
   /**
    * 问题照片url
    */
-  problemIamgeUrl?: string;
+  problemImageUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理
@@ -126,7 +128,7 @@ export interface ComplaintQuery extends PageQuery {
   /**
    * 问题照片url
    */
-  problemIamgeUrl?: string;
+  problemImageUrl?: string;
 
   /**
    * 投诉状态 0待处理 1处理中 2已处理

src/api/system/Decoration/type.ts

@@ -13,7 +13,8 @@ export interface DecorationVO {
    * 所属房屋id
    */
   houseId: string | number;
-
+  buildingId: string;
+  unitNoId: string;
   /**
    * 申请人姓名
    */
@@ -60,12 +61,12 @@ export interface DecorationForm extends BaseEntity {
    * 所属小区id
    */
   villageId?: string;
-
+  villageName?: string;
   /**
    * 所属房屋id
    */
   houseId?: string | number;
-
+  houseName?: string;
   /**
    * 申请人姓名
    */

src/api/system/HandleLog/index.ts

@@ -61,3 +61,10 @@ export const delHandleLog = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+export const uploadAttachments = (files: FormData) => {
+  return request({
+    url: '/handleLog/uploadAttachments',
+    method: 'post',
+    data: files
+  });
+};

src/api/system/HandleLog/type.ts

@@ -28,6 +28,28 @@ export interface HandleLogVO {
    * 办事地点
    */
   handlePosition: string;
+
+  handleLogFileList: FileVO[];
+}
+
+export interface FileVO {
+  /**
+   * 文件id
+   */
+  id: string | number;
+
+  /**
+   * 文件名
+   */
+  fileName: string;
+
+  /**
+   * 文件路径
+   */
+  filePath: string;
+
+  'handleLogId': string;
+  'ossId': string;
 }
 
 export interface HandleLogForm extends BaseEntity {

src/api/system/Inspection/index.ts

@@ -80,3 +80,49 @@ export const list_statapi = (query?: { taskTimeBegin: string; taskTimeEnd: strin
     params: query
   });
 };
+
+export type exportPageApiQuery = {
+  /**
+   * 数据类型：1-日报 / 2-周报 / 3-月报
+   */
+  dataType?: string;
+  /**
+   * 页码
+   */
+  pageNum: number;
+  /**
+   * 每页条数
+   */
+  pageSize: number;
+  /**
+   * 查询开始日期
+   */
+  queryDateBegin?: string;
+  /**
+   * 查询结束日期
+   */
+  queryDateEnd?: string;
+  /**
+   * 日期
+   */
+  statDate?: string;
+};
+
+type exportAllApiQuery = Omit<exportPageApiQuery, 'pageSize' | 'pageNum'>;
+/** 导出当前页 数据api */
+export const exportPageApi = (data: exportPageApiQuery): AxiosPromise<any[]> => {
+  return request({
+    url: '/inspection/data/export/page',
+    method: 'POST',
+    data
+  });
+};
+
+/** 导出 所有 数据api */
+export const exportAllApi = (data: exportAllApiQuery): AxiosPromise<any[]> => {
+  return request({
+    url: '/inspection/data/export',
+    method: 'POST',
+    data
+  });
+};

src/api/system/InspectionPlan/index.ts

@@ -8,7 +8,7 @@ import { PlanVO, PlanForm, PlanQuery } from '@/api/system/InspectionPlan/type';
  * @returns {*}
  */
 
-export const listPlan = (query?: PlanQuery): AxiosPromise<PlanVO[]> => {
+export const listPlan = (query: PlanQuery | {} = {}): AxiosPromise<PlanVO[]> => {
   return request({
     url: '/inspection/plan/list',
     method: 'get',
@@ -61,3 +61,15 @@ export const delPlan = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+/**
+ * 改变巡检计划状态
+ * @param id
+ * @param status
+ */
+export const changePlanStatus = (id: string, status: string) => {
+  return request({
+    url: '/inspection/plan/changeStatus',
+    method: 'put',
+    params: { id, status }
+  });
+};

src/api/system/InspectionPlan/type.ts

@@ -3,17 +3,12 @@ export interface PlanVO {
    * 主键ID
    */
   id: string | number;
-
+  inspectorIds: string;
   /**
    * 巡检计划名称
    */
   planName: string;
 
-  /**
-   * 巡检人员ID，多个用逗号分隔
-   */
-  inspectorIds: string;
-
   /**
    * 执行周期，如：开始日期-结束日期
    */
@@ -32,7 +27,12 @@ export interface PlanVO {
   /**
    * 巡检设置：0-必须拍照，1-可以跳检
    */
-  inspectSetting: string;
+  inspectSetting: number;
+  inspectSettingDict: {
+    dictLabel: string;
+    dictValue: string;
+    listClass: string;
+  };
 
   /**
    * 计划路线，多个用逗号分隔
@@ -53,7 +53,11 @@ export interface PlanVO {
    * 执行周期具体日期
    */
   executeDay: string;
-
+  executeDayList: {
+    dictLabel: string;
+    dictValue: string;
+    listClass: string;
+  }[];
   /** 巡检人员信息 */
   inspectorList: {
     'userId': string;
@@ -106,7 +110,7 @@ export interface PlanForm extends BaseEntity {
   /**
    * 巡检设置：0-必须拍照，1-可以跳检
    */
-  inspectSetting?: string;
+  inspectSetting?: number;
 
   /**
    * 计划路线，多个用逗号分隔

src/api/system/InspectionPoint/index.ts

@@ -8,7 +8,7 @@ import { PointVO, PointForm, PointQuery } from '@/api/system/InspectionPoint/typ
  * @returns {*}
  */
 
-export const listPoint = (query?: PointQuery): AxiosPromise<PointVO[]> => {
+export const listPoint = (query?: PointQuery | {}): AxiosPromise<PointVO[]> => {
   return request({
     url: '/inspection/point/list',
     method: 'get',
@@ -61,3 +61,14 @@ export const delPoint = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+/**
+ * 修改巡检点状态
+ * @param id
+ * @param status
+ */
+export const changePointStatus = (id: string, status: string) => {
+  return request({
+    url: '/inspection/point/changeStatus?id=' + id + '&status=' + status,
+    method: 'PUT'
+  });
+};

src/api/system/InspectionPoint/type.ts

@@ -2,7 +2,7 @@ export interface PointVO {
   /**
    * 主键ID
    */
-  id: string | number;
+  id: string;
 
   /**
    * 巡检点名称
@@ -17,7 +17,7 @@ export interface PointVO {
   /**
    * 所属路线ID
    */
-  routeId: string | number;
+  routeId: string;
 
   /**
    * 巡检点位置（经纬度），格式：经度,纬度

src/api/system/InspectionRecord/index.ts

@@ -19,11 +19,15 @@ export const listRecord = (query?: RecordQuery): AxiosPromise<RecordVO[]> => {
 /**
  * 查询巡检记录主详细
  * @param id
+ * @param date
  */
-export const getRecord = (id: string | number): AxiosPromise<RecordVO> => {
+export const getRecord = (id: string, date?: string): AxiosPromise<RecordVO> => {
   return request({
     url: '/inspection/record/' + id,
-    method: 'get'
+    method: 'get',
+    params: {
+      date
+    }
   });
 };
 

src/api/system/InspectionRecord/type.ts

@@ -1,18 +1,18 @@
 export interface RecordVO {
-  actualEndTime?: null;
+  actualEndTime?: string;
-  actualStartTime?: null;
+  actualStartTime?: string;
-  createByName?: null;
+  createByName?: string;
   createTime?: string;
-  details?: null;
+  details?: DetailsVo[];
   id?: string;
   inspectorId?: number;
   inspectorName?: string;
   planId?: string;
   planName?: string;
-  remark?: null;
+  remark?: string;
   routeId?: string;
   routeName?: string;
-  status?: number;
+  status?: string;
   statusLabel?: null;
   taskName?: string;
   taskTime?: string;
@@ -82,3 +82,19 @@ export interface RecordQuery extends PageQuery {
    */
   taskName?: string;
 }
+
+export interface DetailsVo {
+  'id': string;
+  'taskId': string;
+  'pointId': string;
+  'pointName': string;
+  'location': string;
+  'checkTime': string;
+  'checkResult': string;
+  'photos': string;
+  'sortNo': string;
+  'remark': string;
+  'imgUrl': string;
+  'status': string;
+  photoslist?: string[];
+}

src/api/system/InspectionRoute/index.ts

@@ -8,7 +8,7 @@ import { RouteVO, RouteForm, RouteQuery } from './type';
  * @returns {*}
  */
 
-export const listRoute = (query?: RouteQuery): AxiosPromise<RouteVO[]> => {
+export const listRoute = (query: RouteQuery | {} = {}): AxiosPromise<RouteVO[]> => {
   return request({
     url: '/inspection/route/list',
     method: 'get',
@@ -20,7 +20,7 @@ export const listRoute = (query?: RouteQuery): AxiosPromise<RouteVO[]> => {
  * 查询巡检路线详细
  * @param id
  */
-export const getRoute = (id: string | number): AxiosPromise<RouteVO> => {
+export const getRoute = (id: string): AxiosPromise<RouteVO> => {
   return request({
     url: '/inspection/route/' + id,
     method: 'get'
@@ -61,3 +61,11 @@ export const delRoute = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+export const changeStatusRoute = (id: string, status: string) => {
+  return request({
+    url: '/inspection/route/changeStatus',
+    method: 'put',
+    params: { id, status }
+  });
+};

src/api/system/InspectionRoute/type.ts

@@ -4,7 +4,7 @@ export interface RouteVO {
   /**
    * 主键ID
    */
-  id: string | number;
+  id: string;
 
   /**
    * 巡检路线名称
@@ -26,6 +26,8 @@ export interface RouteVO {
    */
   estimatedTime: number;
 
+  items: { itemName: string }[];
+  PointsName: string;
   /**
    * 备注
    */
@@ -68,7 +70,7 @@ export interface RouteForm extends BaseEntity {
   /**
    * 主键ID
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 巡检路线名称

src/api/system/NoticePc/type.ts

@@ -22,12 +22,12 @@ export interface NoticeVO {
   /**
    * 紧急程度 0=普通 1=紧急 2=非常紧急
    */
-  urgencyLevel: string;
+  urgencyLevel: number;
 
   /**
    * 发布状态 0=草稿 1=已发布
    */
-  publishStatus: string;
+  publishStatus: number;
 
   /**
    * 发布人
@@ -64,12 +64,12 @@ export interface NoticeForm extends BaseEntity {
   /**
    * 紧急程度 0=普通 1=紧急 2=非常紧急
    */
-  urgencyLevel?: string;
+  urgencyLevel?: number;
 
   /**
    * 发布状态 0=草稿 1=已发布
    */
-  publishStatus?: string;
+  publishStatus?: number;
 
   /**
    * 发布人
@@ -101,12 +101,12 @@ export interface NoticeQuery extends PageQuery {
   /**
    * 紧急程度 0=普通 1=紧急 2=非常紧急
    */
-  urgencyLevel?: string;
+  urgencyLevel?: number;
 
   /**
    * 发布状态 0=草稿 1=已发布
    */
-  publishStatus?: string;
+  publishStatus?: number;
 
   /**
    * 发布人

src/api/system/Notification/index.ts

@@ -0,0 +1,40 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+export interface NotificationVo {
+  'id': 'string';
+  'title': 'string';
+  'item': 'string';
+  'content': 'string';
+  'manageIsCheck': 'string';
+  'repairIsCheck': 'string';
+}
+/**
+ * 查询消息通知列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getNotificationList = (query): AxiosPromise<NotificationVo[]> => {
+  return request({
+    url: '/notification/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 消息通知 已读
+ * @returns {*}
+ * @param ids
+ */
+
+export const ReadNotificationByID = (ids: string[]) => {
+  return request({
+    url: '/notification/read',
+    method: 'POST',
+    data: {
+      id: ids
+    }
+  });
+};

src/api/system/ParkingCost/index.ts

@@ -61,3 +61,61 @@ export const delParkingCost = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
+
+export type Request = {
+  /**
+   * 区域id
+   */
+  areaId?: string;
+  /**
+   * 0 审核中 1 审核通过 2 审核不通过
+   */
+  checkStatus?: string;
+  /**
+   * 添加者姓名，sys_user nickname
+   */
+  createName?: string;
+  /**
+   * id车位管理表
+   */
+  id?: string;
+  /**
+   * 车位面积（单位㎡）
+   */
+  parkingArea?: number;
+  /**
+   * 车位编号
+   */
+  parkingCode?: string;
+  /**
+   * 车位楼层
+   */
+  parkingFloor?: string;
+  /**
+   * 车位状态 0 闲置 1自用 2出租
+   */
+  parkingStatus?: string;
+  /**
+   * 备注
+   */
+  remark?: string;
+  /**
+   * 住户id
+   */
+  residentId?: string;
+  /**
+   * 所属小区id
+   */
+  villageId?: string;
+};
+/**
+ * 查询停车缴费 车位列表
+ * @param {Request} queryParams
+ */
+export const getParkingCostCarAreaApi = (queryParams: Request) => {
+  return request({
+    url: '/parkingCost/parkingList',
+    method: 'get',
+    params: queryParams
+  });
+};

src/api/system/ParkingCost/type.ts

@@ -12,7 +12,7 @@ export interface ParkingCostVO {
   /**
    * 车位id
    */
-  parkingId: string | number;
+  parkingId: string;
 
   /**
    * 收费项目 0临时停车
@@ -79,7 +79,7 @@ export interface ParkingCostForm extends BaseEntity {
   /**
    * 车位id
    */
-  parkingId?: string | number;
+  parkingId?: string;
 
   /**
    * 收费项目 0临时停车
@@ -141,7 +141,7 @@ export interface ParkingCostQuery extends PageQuery {
   /**
    * 车位id
    */
-  parkingId?: string | number;
+  parkingId?: string;
 
   /**
    * 收费项目 0临时停车

src/api/system/Payment/index.ts

@@ -0,0 +1,159 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取缴费方式，种类占比
+ * @param query
+ * @returns {*}
+ */
+export type IncomeStatsResponse = {
+  'totalDue': string;
+  'totalPaid': string;
+  'totalUnpaid': string;
+  'paidPercentage': string;
+  'payWx': number;
+  'payZfb': number;
+  'payOffline': number;
+  'totalPay': number;
+  'feeTypeStats': feeTypeStats[];
+  'dailyStats': {
+    'statDate': string;
+    'totalDue': string;
+    'totalPaid': string;
+    'totalUnpaid': string;
+  }[];
+};
+export type feeTypeStats = {
+  'feeType': number;
+  'feeName': string;
+  'totalDue': string;
+  'totalPaid': string;
+  'totalUnpaid': string;
+  'paidPercentage': string;
+};
+export const income_statsApi = (datetime?: string): AxiosPromise<IncomeStatsResponse> => {
+  return request({
+    url: '/api/analysis/income/stats',
+    method: 'get',
+    params: {
+      startDate: datetime
+    }
+  });
+};
+
+export interface sourceType {
+  'totalPayable': string;
+  'totalReceived': string;
+  'totalPending': string;
+  'parkingFee': string;
+  'parkingFeePercent': string;
+  'propertyFee': string;
+  'propertyFeePercent': string;
+  'utilityFee': string;
+  'utilityFeePercent': string;
+  'shopRent': string;
+  'shopRentPercent': string;
+  'repairFee': string;
+  'repairFeePercent': string;
+  'garbageFee': string;
+  'garbageFeePercent': string;
+}
+// 收入来源
+export const income_scourcApi = (datetime?: string): AxiosPromise<sourceType> => {
+  return request({
+    url: '/api/analysis/income/source',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+export interface PayMentMethod {
+  'wechatAmount': string;
+  'wechatPercent': string;
+  'alipayAmount': string;
+  'alipayPercent': string;
+  'yidangAmount': string;
+  'yidangPercent': string;
+  'cashAmount': string;
+  'cashPercent': string;
+  'unionPayAmount': string;
+  'unionPayPercent': string;
+  'transferAmount': string;
+  'transferPercent': string;
+  'depositOffsetAmount': string;
+  'depositOffsetAmountPercent': string;
+  'propertyOffsetAmount': string;
+  'propertyOffsetAmountPercent': string;
+}
+// 缴费方式
+export const payment_methodApi = (datetime?: string): AxiosPromise<PayMentMethod> => {
+  return request({
+    url: '/api/analysis/income/payment_method',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+export interface Arrears_distrubution {
+  month: number;
+  amount: string;
+}
+// 欠费分布
+export const arrears_distributionApi = (
+  datetime?: string
+): AxiosPromise<{
+  items: Arrears_distrubution[];
+}> => {
+  return request({
+    url: '/api/analysis/income/arrears_distribution',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+export interface payment_sourceType {
+  'miniProgramAmount': string;
+  'miniProgramPercent': string;
+  'mobileAppAmount': string;
+  'mobileAppPercent': string;
+  'offlineAmount': string;
+  'offlinePercent': string;
+}
+// 缴费来源分析
+export const payment_sourceApi = (datetime?: string): AxiosPromise<payment_sourceType> => {
+  return request({
+    url: '/api/analysis/income/payment_source',
+    method: 'get',
+    params: {
+      date: datetime
+    }
+  });
+};
+
+export interface payment_trendType {
+  'date': string;
+  'paidAmount': string;
+  'unpaidAmount': string;
+}
+
+// 缴费走势分析
+export const payment_trendApi = (
+  startDate?: string,
+  endDate?: string
+): AxiosPromise<{
+  items: payment_trendType[];
+}> => {
+  return request({
+    url: '/api/analysis/income/payment_trend',
+    method: 'get',
+    params: {
+      startDate,
+      endDate
+    }
+  });
+};

src/api/system/Personnel/index.ts

@@ -0,0 +1,111 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 查询入住情况
+ * @param query
+ * @returns {*}
+ */
+
+export const user_movein_list = (query?: {
+  dateTime: string;
+}): AxiosPromise<{
+  'villageId': string;
+  'villageName': string;
+  'totalHouse': number;
+  'occupiedHouse': number;
+  'occupancyRate': string;
+  'occupancyCount': number;
+}> => {
+  return request({
+    url: '/api/analysis/occupancy/stats',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询居住人类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_user_type = (query?: {
+  dateTime: string;
+}): Promise<{
+  'owner': string;
+  'ownerRate': string;
+  'tenant': string;
+  'tenantRate': string;
+  'relatives': string;
+  'relativeRate': string;
+  'otherType': string;
+  'otherRate': string;
+  'totalResident': string;
+}> => {
+  return request({
+    url: '/residentType/selectTotal',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 查询住户性别比例
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_user_sex = (query?: {
+  dateTime: string;
+}): Promise<{
+  'man': number;
+  'woman': number;
+  'total': number;
+  'manRate': string;
+  'womanRate': string;
+}> => {
+  return request({
+    url: '/gender/overview',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取迁入迁出趋势图
+ * @param query
+ * @returns {*}
+ */
+
+export const get_movein_moveout_list = (query?: {
+  date: string;
+}): AxiosPromise<
+  {
+    'date': string;
+    'moveInCount': number;
+    'moveOutCount': number;
+    'totalCount': number;
+  }[]
+> => {
+  return request({
+    url: '/api/analysis/resident/moveInOutStats',
+    method: 'get',
+    params: query
+  });
+};
+
+export const get_person_age = (query?: {
+  dateTime: string;
+}): AxiosPromise<
+  {
+    'date': string;
+    'moveInCount': number;
+    'moveOutCount': number;
+    'totalCount': number;
+  }[]
+> => {
+  return request({
+    url: '/gender/personAge',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/Questionnaire/index.ts

@@ -53,11 +53,47 @@ export const updateQuestionnaire = (data: QuestionnaireForm) => {
 
 /**
  * 删除问卷调查
- * @param id
+ * @param ids
+ * @param vailid
+ * @param ids
+ * @param vailid
  */
-export const delQuestionnaire = (id: string | number | Array<string | number>) => {
+export const delQuestionnaire = (ids: string | string[], vailid: boolean = true) => {
   return request({
-    url: '/questionnaire/' + id,
+    url: '/questionnaire/' + ids + '?isValid=' + vailid,
-    method: 'delete'
+    method: 'delete',
+    headers: {
+      silentError: 'true'
+    }
+  });
+};
+/**
+ * 查询问卷调查回答列表
+ */
+export const getQuestionnaireAnswer = (
+  {
+    pageSize,
+    pageNum,
+    questionnaireId
+  }
+) => {
+  return request({
+    url: '/questionnaireAnswer/list',
+    method: 'GET',
+    params: {
+      pageSize,
+      pageNum,
+      questionnaireId,
+      answerStatus: '1'
+    }
+  });
+};
+/**
+ * 查询问卷调查回答详情
+ */
+export const getQuestionnaireAnswerMain = (id: string) => {
+  return request({
+    url: '/questionnaireAnswer/' + id,
+    method: 'GET'
   });
 };

src/api/system/Questionnaire/type.ts

@@ -37,7 +37,9 @@ export interface QuestionnaireVO {
   /**
    * 部分业主串 ”,“号隔开
    */
-  residents: string | number;
+  residents: string;
+  startTime: string;
+  endTime: string;
 
   /**
    * 备注
@@ -49,7 +51,7 @@ export interface QuestionnaireForm extends BaseEntity {
   /**
    * 问卷ID
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 所属小区id
@@ -69,7 +71,7 @@ export interface QuestionnaireForm extends BaseEntity {
   /**
    * 问卷题目结构（JSON数组）
    */
-  content?: string;
+  content?: string | QuestionComponentItem[];
 
   /**
    * 状态：0-草稿 1-已发布 2-已结束
@@ -152,12 +154,13 @@ export interface QuestionComponentItem {
   type: string;
   title: string;
   required: boolean;
+
   options: QuestionComponentOption[];
 }
 
 export interface QuestionComponentnaireForm {
-  id?: string | number | null;
+  id?: string;
   title: string;
-  description: string;
+  description?: string;
   content: QuestionComponentItem[];
 }

src/api/system/Repair/type.ts

@@ -1,65 +1,32 @@
 export interface RepairVO {
-  /**
+  'id': string;
-   * 报修管理表id
+  'houseId': string;
-   */
+  'maintenanceItemId': number;
-  id: string | number;
+  'maintenanceItemName': number;
-
+  'problem': string;
-  /**
+  'residentId': string;
-   * 关联房屋id
+  'residentName': string;
-   */
+  'phone': string;
-  houseId: string | number;
+  'orderDate': string;
-
+  'problemImageUrl': string;
-  /**
+  'problemStatus': string;
-   * 维修项目id
+  'repairDes': string;
-   */
+  'repairImageUrl': string;
-  maintenanceItemId: string | number;
+  'repairId': string;
-
+  'repairName': string;
-  /**
+  'houseName': string;
-   * 问题描述
+  'item': string;
-   */
+  'projectType': number;
-  problem: string;
+  'updateTime': string;
-
+  'projectTypeStr': string;
-  /**
+  'repairIsCheck': string;
-   * 报修人id(住户表id)
+  'manageIsCheck': string;
-   */
+  'isCheckStr': number;
-  residentId: string | number;
+  'repairPhone': number;
-
+  'repairRoleName': number;
-  /**
+  'repairStatus': string;
-   * 手机号码
+  repairUserId: string;
-   */
+  'createTime': string;
-  phone: number;
-
-  /**
-   * 预约日期
-   */
-  orderDate: string;
-
-  /**
-   * 问题图片地址
-   */
-  problemImageUrl: string;
-
-  /**
-   * 0 已提交 1已分配  2维修中 3维修完成
-   */
-  problemStatus: string;
-
-  /**
-   * 维修描述
-   */
-  repairDes: string;
-
-  /**
-   * 维修图片url
-   */
-  repairImageUrl: string;
-
-  /**
-   * 维修人员id
-   */
-  repairId: string | number;
-  /** 名称（小区名-楼栋名-单元号-房间号） */
-  name?: string;
 }
 
 export interface RepairForm extends BaseEntity {
@@ -86,12 +53,12 @@ export interface RepairForm extends BaseEntity {
   /**
    * 报修人id(住户表id)
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 手机号码
    */
-  phone?: number;
+  phone?: string;
 
   /**
    * 预约日期
@@ -163,12 +130,12 @@ export interface RepairQuery extends PageQuery {
   /**
    * 报修人id(住户表id)
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 手机号码
    */
-  phone?: number;
+  phone?: string;
 
   /**
    * 预约日期

src/api/system/RepairProject/type.ts

@@ -2,7 +2,7 @@ export interface RepairProjectVO {
   /**
    * 维修项目表id
    */
-  id: string | number;
+  id: string;
 
   /**
    * 维修项目名
@@ -12,7 +12,7 @@ export interface RepairProjectVO {
   /**
    * 父级项目id
    */
-  parentId: string | number;
+  parentId: string;
 
   /**
    * 项目类型 0公共报修 1个人报修
@@ -23,7 +23,7 @@ export interface RepairProjectVO {
    * 项目层级 0，1
    */
   projectLevel: number;
-
+  children?: RepairProjectVO[];
   /**
    * 排序 （数越小越靠前）
    */
@@ -33,13 +33,16 @@ export interface RepairProjectVO {
    * 状态 0启用 1停用
    */
   status: string;
+
+  disabled?: boolean;
+  // children?: RepairProjectVO[];
 }
 
 export interface RepairProjectForm extends BaseEntity {
   /**
    * 维修项目表id
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 维修项目名
@@ -49,7 +52,7 @@ export interface RepairProjectForm extends BaseEntity {
   /**
    * 父级项目id
    */
-  parentId?: string | number;
+  parentId?: string;
 
   /**
    * 项目类型 0公共报修 1个人报修
@@ -70,26 +73,6 @@ export interface RepairProjectForm extends BaseEntity {
    * 状态 0启用 1停用
    */
   status?: string;
-
-  /**
-   * 创建时间
-   */
-  cretaeTime?: string;
-
-  /**
-   * 创建者
-   */
-  createBy?: number;
-
-  /**
-   * 更新时间
-   */
-  updateTime?: string;
-
-  /**
-   * 更新者
-   */
-  updateBy?: number;
 }
 
 export interface RepairProjectQuery extends PageQuery {
@@ -101,7 +84,7 @@ export interface RepairProjectQuery extends PageQuery {
   /**
    * 父级项目id
    */
-  parentId?: string | number;
+  parentId?: string;
 
   /**
    * 项目类型 0公共报修 1个人报修
@@ -122,9 +105,4 @@ export interface RepairProjectQuery extends PageQuery {
    * 状态 0启用 1停用
    */
   status?: string;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
 }

src/api/system/SdbBill/index.ts

@@ -62,9 +62,10 @@ export const delBill = (id: string | number | Array<string | number>) => {
   });
 };
 
+// ! =---------------=================================== 组件
 export interface BillHouse {
   'buildingName': string;
-  'houseId': number;
+  'houseId': string;
   'unitNo': number;
   'houseNo': string;
   'floorNo': number;
@@ -82,3 +83,50 @@ export const listBillHouse = (query: { pageNum: number; pageSize: number }): Axi
     params: query
   });
 };
+
+// ! =---------------
+export type BillUserlist = {
+  'gender': string;
+  'phone': string;
+  'house_name': string;
+  'residentName': string;
+  'houseNo': string;
+  'residentId': string;
+  'buildingId': string;
+  'parkingId': string;
+};
+/**
+ * 查询业主列表
+ * @param query
+ * @param query
+ */
+export const queryResidentList_holder = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
+  return request({
+    url: '/bill/getResidentList',
+    method: 'GET',
+    params: query
+  });
+};
+
+/**
+ * 查询车位业主列表
+ * @param query
+ * @param query
+ */
+export const queryResidentList_Cars = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
+  return request({
+    url: '/bill/getParkingList',
+    method: 'GET',
+    params: query
+  });
+};
+/**
+ * 生成账单
+ */
+export const manualGenerateApi = (data: { billId: string; chargePeriod: string; yearMonths?: string[]; year?: string[] }) => {
+  return request({
+    url: '/bill/manualGenerate',
+    method: 'POST',
+    data
+  });
+};

src/api/system/SdbBill/type.ts

@@ -3,6 +3,7 @@ export interface BillVO {
    * 账单管理表id
    */
   id: string;
+  billName: string;
 
   /**
    * 账单编号
@@ -13,14 +14,19 @@ export interface BillVO {
    * 收费项目id
    */
   chargeItemId: string;
+  residentIds: string[];
 
   /**
    * 收费范围 0全体业主 1部分业主
    */
   chargeScope: string;
+  /**
+   * 按季度收费时，指定季度起始年月列表，格式 "yyyy-MM"，如 ["2026-01", "2026-04", "2026-07"]
+   */
+  periodCalcType: string;
 
   /**
-   * 收费周期 0年 1月  2日
+   * 收费周期 0年 1月 2日 3 季度 4永久；为空时取账单配置
    */
   chargePeriod: string;
 
@@ -48,6 +54,8 @@ export interface BillVO {
    * 创建时间
    */
   cerateTime: string;
+
+  parkingIds: string[];
 }
 
 export interface BillForm extends BaseEntity {
@@ -103,7 +111,7 @@ export interface BillForm extends BaseEntity {
   /**
    * 创建时间
    */
-  cerateTime?: string;
+  createTime?: string;
 }
 
 export interface BillQuery extends PageQuery {
@@ -117,6 +125,8 @@ export interface BillQuery extends PageQuery {
    */
   chargeItemId?: string | number;
 
+  // type: string;
+
   /**
    * 收费范围 0全体业主 1部分业主
    */

src/api/system/SdbCashier/index.ts

@@ -0,0 +1,130 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+export type cashlist = {
+  'residentId': string;
+  'residentName': string;
+  'houseName': string;
+  'phone': string;
+};
+
+/**
+ * 查询住户列表
+ * @returns {*}
+ * @param data
+ */
+export const cashQuery = (data: { residentName?: string; queryType: number }): AxiosPromise<cashlist[]> => {
+  return request({
+    url: '/cash/residentList',
+    method: 'post',
+    data: data
+  });
+};
+
+export type billlistType = {
+  needPayAmount: string; // 需要支付金额
+  actualAccount: string; // 实际支付金额
+  singleDiscountAmount: string; // 单笔优惠金额
+  'villageId': string;
+  'residentId': string;
+  'houseId': string;
+  'detailsId': string;
+  'houseName': string;
+  'parkingId': string;
+  'parkingName': string;
+  'billId': string;
+  'chargeTypeName': string;
+  'chargeItemName': string;
+  'billingType': string;
+  'formula': string;
+  'fixedPrice': string;
+  'startDate': string;
+  'endDate': string;
+  'money': string;
+  'payStatus': string;
+  'remark': string;
+  amount: string;
+  residentName: string;
+};
+
+/**
+ * 查询账单列表
+ * @returns {*}
+ * @param data
+ */
+export const billQuery = (data: { residentId?: string; payStatus: '0' | '1' }): AxiosPromise<billlistType[]> => {
+  return request({
+    url: '/cash/billList',
+    method: 'post',
+    data: data
+  });
+};
+export const billEdit = (data: { 'detailsId': string[]; 'payType': string; 'payStatus': string }): AxiosPromise<billlistType[]> => {
+  return request({
+    url: '/cash/billEdit',
+    method: 'post',
+    data: data
+  });
+};
+
+// 打印票据
+export const billPrint = (data: { 'detailsIds': string[]; 'residentId': string }): AxiosPromise<BillPrintType> => {
+  return request({
+    url: '/cash/print',
+    method: 'post',
+    data: data
+  });
+};
+// 查询所有账单总金额
+export const getAllAccount = (
+  data = {}
+): AxiosPromise<{
+  /** 总金额 */
+  'receivableAmount': string;
+  /** 总实收金额 */
+  'receivedAmount': string;
+  /** 总优惠金额 */
+  'discountAmount': string;
+  /** 未收金额 */
+  'unpaidAmount': string;
+}> => {
+  return request({
+    url: '/cash/billAmountSummary',
+    method: 'post',
+    data: data
+  });
+};
+
+// 删除账单
+export const billDelete = (ids: string | string[]) => {
+  return request({
+    url: `/cash/bill/${ids}`,
+    method: 'DELETE'
+  });
+};
+
+export type BillPrintType = {
+  'totalAccount': string;
+  'residentName': string;
+  'payTypeSummary': {
+    'payType': string;
+    'payAmount': string;
+  }[];
+  'detailsList': {
+    'detailsId': string;
+    'chargeItemName': string;
+    'billName': string;
+    'detailsTime': string;
+    'useCount': string;
+    'account': string;
+    'payType': string;
+    'singleDiscountAmount': string;
+    'actualAccount': string;
+    'remark': string;
+  }[];
+  'printDate': string;
+  totalDiscountAmount: string;
+  totalActualAccount: string;
+  'HouseName': string;
+  'title': string;
+};

src/api/system/SdbChargeItem/index.ts

@@ -8,7 +8,7 @@ import { ChargeItemVO, ChargeItemForm, ChargeItemQuery } from './type';
  * @returns {*}
  */
 
-export const listChargeItem = (query?: ChargeItemQuery): AxiosPromise<ChargeItemVO[]> => {
+export const listChargeItem = (query?: ChargeItemQuery | {}): AxiosPromise<ChargeItemVO[]> => {
   return request({
     url: '/chargeItem/list',
     method: 'get',
@@ -64,7 +64,7 @@ export const delChargeItem = (id: string | number | Array<string | number>) => {
 
 /**
  *  启停 收费项目
- * @param id
+ * @param data
  */
 export const changChargeItem = (data: { id: string; status: string }) => {
   return request({

src/api/system/SdbChargeItem/type.ts

@@ -12,6 +12,7 @@ export interface ChargeItemVO {
    * 收费类型
    */
   typeId: string;
+  itemName: string;
 
   /**
    * 计费方式 0单次收费 1 周期收费 2 仪表收费
@@ -52,6 +53,10 @@ export interface ChargeItemVO {
    * 小区id
    */
   villageId: string;
+  /**
+   * 状态 0正常 1停用
+   */
+  status: string;
 }
 
 export interface ChargeItemForm extends BaseEntity {

src/api/system/SdbElectricityDevice/index.ts

@@ -64,11 +64,11 @@ export const delElectricityDevice = (id: string | number | Array<string | number
 
 /**
  * 生成条形码
- * @param id
+ * @param data
  */
 export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
-    url: '/electricityDevice/generateBarCodee',
+    url: '/electricityDevice/generateBarCode',
     method: 'POST',
     data: data
   });
@@ -76,7 +76,7 @@ export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: str
 
 /**
  * 获取设备指定时间段的用电量
- * @param id
+ * @param data
  */
 export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
@@ -85,3 +85,14 @@ export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: strin
     data
   });
 };
+
+/**
+ * 电表解绑房屋
+ * @param { string } deviceCode
+ */
+export const ElectricityDeviceUnbind = (deviceCode: string) => {
+  return request({
+    url: `/electricityDevice/unbind/${deviceCode}`,
+    method: 'PUT'
+  });
+};

src/api/system/SdbTopupRecord/index.ts

@@ -61,3 +61,45 @@ export const delTopupRecord = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
+
+export type TopupRecordList = {
+  'id': string;
+  'rechargeTime': string;
+  'villageName': string;
+  'residentName': string;
+  'houseName': string;
+  'fixedPriceUnit': string;
+  'fixedPrice': string;
+  'unit': string;
+  'deviceCode': string;
+  'orderId': string;
+  'rechargeAmount': string;
+  'topUpType': string;
+};
+/** 查询所有设备充值记录 */
+export const getTopupRecordByDate = (query: {
+  startTime?: string;
+  endTime?: string;
+  pageSize: number;
+  pageNum: number;
+}): AxiosPromise<TopupRecordList[]> => {
+  return request({
+    url: '/topupRecord/water/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/** 查询所有电表充值记录 */
+export const getElectricityTopupRecordByDate = (query: {
+  startTime?: string;
+  endTime?: string;
+  pageSize: number;
+  pageNum: number;
+}): AxiosPromise<TopupRecordList[]> => {
+  return request({
+    url: '/topupRecord/electricity/list',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/SdbWaterDevice/index.ts

@@ -64,7 +64,7 @@ export const delWaterDevice = (id: string | number | Array<string | number>) =>
 
 /**
  * 获取设备指定时间段的用水量
- * @param id
+ * @param data
  */
 export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
   return request({
@@ -76,7 +76,7 @@ export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'st
 
 /**
  * 生成条形码
- * @param id
+ * @param data
  */
 export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
   return request({
@@ -87,7 +87,7 @@ export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[
 };
 /**
  * 更新固件
- * @param id
+ * @param data
  */
 export const WaterDeviceUpdateBin = (data: { deviceCodes: string[]; urlA: string; urlB: string }) => {
   return request({
@@ -96,3 +96,25 @@ export const WaterDeviceUpdateBin = (data: { deviceCodes: string[]; urlA: string
     data: data
   });
 };
+
+/**
+ * 获取设备最新的抄表记录
+ * @param deviceCodes
+ */
+export const latestRecord = (deviceCodes: string) => {
+  return request({
+    url: `/waterDevice/latestRecord/${deviceCodes}`,
+    method: 'GET'
+  });
+};
+
+/**
+ * 解绑设备绑定的房屋
+ * @param deviceCode
+ */
+export const waterDeviceUnbind = (deviceCode: string) => {
+  return request({
+    url: `/waterDevice/unbind/${deviceCode}`,
+    method: 'PUT'
+  });
+};

src/api/system/Tstock/index.ts

@@ -17,8 +17,8 @@ export const listStock = (query?: any): AxiosPromise<any[]> => {
 
 /**
  * 查询 库存查询 详情
- * @param query
  * @returns {*}
+ * @param id
  */
 
 export const listStockMain = (id?: string): AxiosPromise<any[]> => {

src/api/system/Tsupplier/index.ts

@@ -8,7 +8,7 @@ import { SupplierVO, SupplierForm, SupplierQuery } from './type';
  * @returns {*}
  */
 
-export const listSupplier = (query?: SupplierQuery): AxiosPromise<SupplierVO[]> => {
+export const listSupplier = (query: SupplierQuery | {} = {}): AxiosPromise<SupplierVO[]> => {
   return request({
     url: '/warehouse/supplier/list',
     method: 'get',

src/api/system/Twarehouse/type.ts

@@ -2,7 +2,7 @@ export interface WarehouseVO {
   /**
    * 仓库ID
    */
-  id: string | number;
+  id: string;
 
   /**
    * 仓库名称*
@@ -12,7 +12,7 @@ export interface WarehouseVO {
   /**
    * 仓库归属id*（关联com_village）
    */
-  villageId: number;
+  villageId: string;
 
   /**
    * 联系人*
@@ -44,7 +44,7 @@ export interface WarehouseForm extends BaseEntity {
   /**
    * 仓库ID
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 仓库名称*
@@ -88,11 +88,6 @@ export interface WarehouseQuery extends PageQuery {
    */
   warehouseName?: string;
 
-  /**
-   * 仓库归属id*（关联com_village）
-   */
-  villageId?: string;
-
   /**
    * 联系人*
    */

src/api/system/carArea/index.ts

@@ -8,7 +8,7 @@ import { AreaVO, AreaForm, AreaQuery } from '@/api/system/carArea/type';
  * @returns {*}
  */
 
-export const listArea = (query?: AreaQuery): AxiosPromise<AreaVO[]> => {
+export const listArea = (query: AreaQuery | {} = {}): AxiosPromise<AreaVO[]> => {
   return request({
     url: '/area/list',
     method: 'get',

src/api/system/cars/index.ts

@@ -64,12 +64,28 @@ export const delCar = (id: string | number | Array<string | number>) => {
 
 /**
  * 删除车辆图片
- * @param id
+ * @param format
  */
-export const uploadCar = (formdata: FormData) => {
+export const uploadCar = (format: FormData) => {
   return request({
     url: '/car/uploadImage',
     method: 'POST',
-    data: formdata
+    data: format
+  });
+};
+
+export interface AppUserList {
+  'user_id': string;
+  'user_name': string;
+  'user_phone': string;
+}
+/**
+ * 获取用户端app-用户
+ *  */
+export const getAppUser = (data): AxiosPromise<AppUserList[]> => {
+  return request({
+    url: '/car/getAppUserList',
+    method: 'GET',
+    params: data
   });
 };

src/api/system/cars/type.ts

@@ -2,22 +2,22 @@ export interface CarVO {
   /**
    * 车辆管理表id
    */
-  id: string | number;
+  id: string;
 
   /**
    * 区域id
    */
-  areaId: string | number;
+  areaId: string;
 
   /**
    * 车位id
    */
-  parkingId: string | number;
+  parkingId: string;
 
   /**
    * 持有人id(住户表id)
    */
-  residentId: string | number;
+  residentId: string;
 
   /**
    * 车牌号

src/api/system/community/type.ts

@@ -4,9 +4,9 @@ export interface communitylist_rows_type {
   villageCode: string;
   address: string;
   houseUse: number | null;
-  villageArea: number;
+  villageArea: string;
   remark: string;
-  parkingSpaceCount: number;
+  parkingSpaceCount: string;
   villageImageUrl: string;
   city: string;
   status: '0' | '1';

src/api/system/dept/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { DeptForm, DeptQuery, DeptTreeVO, DeptVO } from './types';
+import { DeptForm, DeptQuery, DeptVO } from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {

src/api/system/equipment/Category/type.ts

@@ -12,7 +12,7 @@ export interface DeviceCategoryVO {
   /**
    * 状态 0正常 1停用
    */
-  status: string;
+  status: number;
 
   /**
    * 备注
@@ -34,7 +34,7 @@ export interface DeviceCategoryForm extends BaseEntity {
   /**
    * 状态 0正常 1停用
    */
-  status?: string;
+  status?: number;
 
   /**
    * 备注
@@ -51,7 +51,7 @@ export interface DeviceCategoryQuery extends PageQuery {
   /**
    * 状态 0正常 1停用
    */
-  status?: string;
+  status?: number;
 
   /**
    * 日期范围参数

src/api/system/equipment/archive/type.ts

@@ -1,4 +1,5 @@
 export interface DeviceVO {
+  categoryName: string;
   /**
    * 主键ID
    */
@@ -18,6 +19,7 @@ export interface DeviceVO {
    * 设备编号
    */
   deviceCode: string;
+  shelfLife: string;
 
   /**
    * 设备型号

src/api/system/house/index.ts

@@ -5,20 +5,19 @@ import { addBuildingType, addHouseType, BuildingUnit, BuildingVo } from './type'
 // 楼栋---------------------------------------------------------------------------------------
 
 /** 根据 小区id 和 类型   查询楼栋信息 */
-export function getBuildinglistAPI(buildingUse: string): AxiosPromise<BuildingVo[]> {
+export function getBuildinglistAPI(query = {}): AxiosPromise<BuildingVo[]> {
   return request({
     url: '/building/byVillage',
     method: 'get',
-    params: {
+    params: query
-      buildingUse: buildingUse
-    }
   });
 }
 /** 获取所有楼栋 */
-export function getBuildinglists(): AxiosPromise<BuildingVo[]> {
+export function getBuildinglists(query = {}): AxiosPromise<BuildingVo[]> {
   return request({
     url: '/building/list',
-    method: 'get'
+    method: 'get',
+    params: query
   });
 }
 /** 获取单一楼栋 */
@@ -46,7 +45,7 @@ export function editBuildingApi(data: addBuildingType & { id: string }) {
   });
 }
 /** 删除楼栋 */
-export function deleteBuildingApi(id: number) {
+export function deleteBuildingApi(id: string) {
   return request({
     url: `/building/${id}`,
     method: 'DELETE'
@@ -55,9 +54,9 @@ export function deleteBuildingApi(id: number) {
 
 // 房屋----------------------------------------------------------------------------------------------
 /** 根据 楼栋id 查询房屋信息 */
-export function getHouselistAPI(buildingId: string): AxiosPromise<BuildingUnit> {
+export function getHouselistAPI(buildingId: string, houseName: string = '', houseUseTypeId: string = ''): AxiosPromise<BuildingUnit> {
   return request({
-    url: `/house/groupByUnitTree/${buildingId}`,
+    url: `/house/groupByUnitTree/${buildingId}?houseName=${houseName}&houseUseTypeId=${houseUseTypeId}`,
     method: 'get'
   });
 }
@@ -100,3 +99,89 @@ export function getVillageTree(id: string) {
     method: 'GET'
   });
 }
+
+/** 根据小区id，获取当前小区的树状结构 */
+export function getHouseMain(id: string): Promise<Response> {
+  return request({
+    url: `/house/ByIdList?houseId=` + id,
+    method: 'GET'
+  });
+}
+
+export interface Response {
+  code: number;
+  data: Data;
+  msg: string;
+}
+
+export interface Data {
+  billResidentList: BillResidentList[];
+  chargeItemList: string[];
+  house: House;
+  parkingList: Parking[];
+  residentList: ResidentList[];
+  storeroom: Storeroom;
+}
+
+export interface BillResidentList {
+  billCode: string;
+  billName: string;
+  chargeItemId: string;
+  chargeTypeName: string;
+  money: string;
+  payStatus: string;
+  useCount: string;
+}
+
+export interface House {
+  buildingName: string;
+  floorNo: number;
+  houseArea: string;
+  houseId: number;
+  houseNo: string;
+  houseType: string;
+  internalArea: string;
+  shareArea: string;
+  unitNoName: string;
+  villageName: string;
+}
+
+export interface ResidentList {
+  gender: string;
+  ownerRelationship: string;
+  phone: string;
+  residentId: string;
+  residentName: string;
+  residentStatus: string;
+  residentType: string;
+}
+
+export interface Storeroom {
+  buildingName: string;
+  houseArea: string;
+  internalArea: string;
+  shareArea: string;
+  storeroomId: number;
+  storeroomNo: string;
+  remark: string;
+  unitNoId: string;
+  unitNo: number;
+
+  unitNoName: string;
+}
+
+export interface Parking {
+  'parkingArea': number;
+  'areaName': string;
+  'createTime': string;
+  'parkingId': string;
+  'parkingStatus': string;
+  'remark': string;
+  'parkingFloor': string;
+  'type': string;
+  'villageId': number;
+  'parkingCode': string;
+  'residentName': string;
+  'residentId': string;
+  'createName': string;
+}

src/api/system/house/type.ts

@@ -47,14 +47,15 @@ export interface BuildingUnit {
   buildingId: number;
   buildingName: string;
   floorCount: number;
-  unitCount: number;
   units: BuildingUnitlist[];
 }
 // 单元
 export interface BuildingUnitlist {
   floors: FloorsType[];
-  unitNo: number;
+  unitNoName: string;
+  unitNoId: string;
 }
+
 // 楼层
 export interface FloorsType {
   floorNo: string;
@@ -80,11 +81,15 @@ export interface addHouseType {
   'houseId'?: string;
   'buildingId'?: string;
   'villageId'?: string;
-  'unitNo': string;
+  'houseUseTypeId': string;
+  'unitNoId': string;
   'floorNo': string;
   'houseNo': string;
   'houseArea': string;
   'internalArea': string;
   'shareArea': string;
   'houseType': string;
+  'storeroomId': string;
+  'parkingId'?: string;
+  'parkingIds': string[];
 }

src/api/system/houseRental/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { HouseRentalVO, HouseRentalForm, HouseRentalQuery } from '@/api/system/houseRental/type';
+import { HouseRentalVO, HouseRentalForm, HouseRentalQuery, HouseRentalSigningVO } from '@/api/system/houseRental/type';
 
 /**
  * 查询房屋租赁管理列表
@@ -74,10 +74,52 @@ interface uploadHouseImagetype {
   }[];
   'error': string[];
 }
-export const uploadHouseImage = (formdata: FormData): AxiosPromise<uploadHouseImagetype> => {
+export const uploadHouseImage = (formData: FormData): AxiosPromise<uploadHouseImagetype> => {
   return request({
     url: '/houseRental/uploadImages',
     method: 'POST',
-    data: formdata
+    data: formData
+  });
+};
+export const getHouseOwnUser = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
+  return request({
+    url: `/houseRental/ownerName/${houseId}`,
+    method: 'GET'
+  });
+};
+
+/**
+ * 房屋租赁管理 改变状态 0：下架 1：上架
+ * @param houseId
+ * */
+export const changeHouseRedientStatus = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
+  return request({
+    url: `/houseRental/changeStatus/${houseId}`,
+    method: 'PUT'
+  });
+};
+
+/**
+ * 房屋租赁管理 签约
+ * @param data
+ */
+export const HouseRedientSign = (data: HouseRentalSigningVO): AxiosPromise<uploadHouseImagetype> => {
+  return request({
+    url: `/houseRental/sign`,
+    method: 'POST',
+    data: data
+  });
+};
+
+/**
+ * 房屋租赁管理 签约上传
+ * @param url
+ * @param data
+ */
+export const HouseRedientSignUpload = (url: string, data: FormData) => {
+  return request({
+    url: url,
+    method: 'POST',
+    data: data
   });
 };

src/api/system/houseRental/type.ts

@@ -2,7 +2,7 @@ export interface HouseRentalVO {
   /**
    * id  房屋租赁表id
    */
-  id?: string | number;
+  id: string;
 
   /**
    * 租户姓名
@@ -57,7 +57,7 @@ export interface HouseRentalVO {
   /**
    * 手机号
    */
-  phone: number;
+  phone: string;
 
   /**
    * 微信
@@ -72,7 +72,7 @@ export interface HouseRentalVO {
   /**
    * 房屋id
    */
-  houseId: number;
+  houseId: string;
   /**
    * 房屋用途
    */
@@ -88,90 +88,60 @@ export interface HouseRentalVO {
   pubTime: string;
   houseImageUrls: string[];
   facilitieslist: string[];
+  signingList?: HouseRentalSigningVO[];
 }
 
 export interface HouseRentalForm extends BaseEntity {
+  id: string;
+  houseId: string;
+  rentalName: string; // 租户姓名
+  rent: string; // 租金
+  houseFace: string; // 房屋朝向
+  rentalType: string; //  整租合租
+  phone: string; //手机号
+  houseArea: number; // 房屋面积
+  floorNo: number; //楼层号
+  inTime: string; //入住时间
+  facilities: string; //房屋设施
+  houseImageUrl: string; //房屋图片
+  supInfo: string; //补充租房信息
+  vx: string; //微信
+  houseUse?: string; //房屋用途
+  rentalStatus: number; //租赁状态
+  buildingId: string; //楼栋id
+  unitNoId: string; //单元id
+  email: string; //邮箱
   /**
-   * id  房屋租赁表id
+   * 小区id
    */
-  id?: string | number;
+  villageId?: string;
-
+}
-  /**
+export interface HouseRentalSigningVO {
-   * 租户姓名
+  rentAmount: string | number;
-   */
+  depositAmount: string | number;
-  rentalName?: string;
+  'id': string;
-
+  'rentalId': string;
-  /**
+  'contractNo': string;
-   * 租金 单位元
+  'tenantName': string;
-   */
+  'tenantPhone': string;
-  rent?: number;
+  'chargeMode': string;
-
+  'chargeStandard': string;
-  /**
+  'contractName': string;
-   * 0 整租 1 合租
+  'contractStatus': string;
-   */
+  'leaseStartDate': string;
-  rentalType?: number;
+  'leaseEndDate': string;
-
+  'houseId': string;
-  /**
+  contractUrl: string;
-   * 房屋朝向
+  'villageId': string;
-   */
+  'remark': string;
-  houseFace?: string;
+  'createTime': string;
-
-  /**
-   * 房屋面积
-   */
-  houseArea?: number;
-
-  /**
-   * 楼层号
-   */
-  floorNo?: number;
-
-  /**
-   * 入住时间
-   */
-  inTime?: string;
-
-  /**
-   * 房屋设施（“，”隔开）
-   */
-  facilities?: string;
-
-  /**
-   * 房屋照片url( "," 隔开)
-   */
-  houseImageUrl?: string;
-
-  /**
-   * 补充租房信息
-   */
-  supInfo?: string;
-
-  /**
-   * 手机号
-   */
-  phone?: number;
-
-  /**
-   * 微信
-   */
-  vx?: string;
-
-  /**
-   * 邮箱
-   */
-  email?: string;
-
-  /**
-   * 房屋id
-   */
-  houseId?: string | number;
 }
 
 export interface HouseRentalQuery extends PageQuery {
   /**
    * 房屋用途
    */
-  houseUse?: number;
+  houseUse?: string;
   /**
    * 租户姓名
    */
@@ -185,7 +155,7 @@ export interface HouseRentalQuery extends PageQuery {
   /**
    * 0 整租 1 合租
    */
-  rentalType?: number;
+  rentalType?: string;
 
   /**
    * 房屋朝向

src/api/system/houseUnit/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { UnitNoVO, UnitNoForm, UnitNoQuery } from './type';
+
+/**
+ * 查询单元列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listUnitNo = (query?: UnitNoQuery): AxiosPromise<UnitNoVO[]> => {
+  return request({
+    url: '/unitNo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询单元详细
+ * @param id
+ */
+export const getUnitNo = (id: string | number): AxiosPromise<UnitNoVO> => {
+  return request({
+    url: '/unitNo/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增单元
+ * @param data
+ */
+export const addUnitNo = (data: UnitNoForm) => {
+  return request({
+    url: '/unitNo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改单元
+ * @param data
+ */
+export const updateUnitNo = (data: UnitNoForm) => {
+  return request({
+    url: '/unitNo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除单元
+ * @param id
+ */
+export const delUnitNo = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/unitNo/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 根据 楼栋id 获取单元
+ * @param id
+ */
+export const getByBUildingidtoUnitNo = (id: string) => {
+  return request({
+    url: '/unitNo/byBuildingList',
+    method: 'GET',
+    params: {
+      buildingId: id
+    }
+  });
+};

src/api/system/houseUnit/type.ts

@@ -0,0 +1,65 @@
+export interface UnitNoVO {
+  /**
+   * 单元表id
+   */
+  id: string | number;
+
+  /**
+   * 单元名称
+   */
+  name: string;
+
+  /**
+   * 小区id
+   */
+  villageId: string | number;
+
+  /**
+   * 楼栋id
+   */
+  buildingId: string | number;
+}
+
+export interface UnitNoForm extends BaseEntity {
+  /**
+   * 单元表id
+   */
+  id?: string | number;
+
+  /**
+   * 单元名称
+   */
+  name?: string;
+
+  /**
+   * 小区id
+   */
+  villageId?: string | number;
+
+  /**
+   * 楼栋id
+   */
+  buildingId?: string | number;
+}
+
+export interface UnitNoQuery extends PageQuery {
+  /**
+   * 单元名称
+   */
+  name?: string;
+
+  /**
+   * 小区id
+   */
+  villageId?: string | number;
+
+  /**
+   * 楼栋id
+   */
+  buildingId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/system/houseUse/index.ts

@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { HouseUseTypeVO, HouseUseTypeForm, HouseUseTypeQuery } from './type';
+
+/**
+ * 查询房屋类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
+  return request({
+    url: '/houseUseType/list',
+    method: 'get',
+    params: query
+  });
+};
+export const listHouseUseType_add_house = (query?: HouseUseTypeQuery | {}): AxiosPromise<HouseUseTypeVO[]> => {
+  return request({
+    url: '/houseUseType/getList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询房屋类型详细
+ * @param id
+ */
+export const getHouseUseType = (id: string | number): AxiosPromise<HouseUseTypeVO> => {
+  return request({
+    url: '/houseUseType/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增房屋类型
+ * @param data
+ */
+export const addHouseUseType = (data: HouseUseTypeForm) => {
+  return request({
+    url: '/houseUseType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改房屋类型
+ * @param data
+ */
+export const updateHouseUseType = (data: HouseUseTypeForm) => {
+  return request({
+    url: '/houseUseType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除房屋类型
+ * @param id
+ */
+export const delHouseUseType = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/houseUseType/' + id,
+    method: 'delete'
+  });
+};

src/api/system/houseUse/type.ts

@@ -0,0 +1,35 @@
+export interface HouseUseTypeVO {
+  /**
+   * 房屋类型id
+   */
+  id: string | number;
+
+  /**
+   * 用途名称
+   */
+  name: string;
+}
+
+export interface HouseUseTypeForm extends BaseEntity {
+  /**
+   * 房屋类型id
+   */
+  id?: string | number;
+
+  /**
+   * 用途名称
+   */
+  name?: string;
+}
+
+export interface HouseUseTypeQuery extends PageQuery {
+  /**
+   * 用途名称
+   */
+  name?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/system/oss/index.ts

@@ -12,7 +12,7 @@ export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
 }
 
 // 查询OSS对象基于id串
-export function listByIds(ossId: string | number): AxiosPromise<OssVO[]> {
+export function listByIds(ossId: string): AxiosPromise<OssVO[]> {
   return request({
     url: '/resource/oss/listByIds/' + ossId,
     method: 'get'

src/api/system/parking/index.ts

@@ -61,3 +61,66 @@ export const delParking = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+/**
+ * 改变车位审核装填
+ * @param data
+ */
+export const getParkingReview = (data: { id: string; propertyReviewFeedback: string; propertyStatus: number }) => {
+  return request({
+    url: '/parkingReview/checkStatus',
+    method: 'POST',
+    data
+  });
+};
+/**
+ * 获取车位审核信息
+ * @param id
+ */
+export const getParkingReviewInfo = (id: string) => {
+  return request({
+    url: '/parking/checkInfo',
+    method: 'POST',
+    data: {
+      id
+    }
+  });
+};
+/**
+ * 查询小区内车位列表
+ * @param { string } villageid
+ * @param houseId
+ * @returns {*}
+ */
+
+export const GetVillageListParking = (villageid: string, houseId: string = undefined): AxiosPromise<ParkingVO[]> => {
+  return request({
+    url: `/parking/getList`,
+    method: 'POST',
+    data: {
+      villageId: villageid,
+      houseId: houseId
+    }
+  });
+};
+
+/**
+ * 查询 车位持有人信息
+ * @returns {*}
+ * @param residentId
+ */
+export const getParkingResidentInfo = (
+  residentId: string
+): AxiosPromise<{
+  id: '';
+  name: '';
+  type: '';
+  status: '';
+  idCard: '';
+  phone: '';
+  houseName: '';
+}> => {
+  return request({
+    url: `/car/holder/${residentId}`,
+    method: 'GET'
+  });
+};

src/api/system/parking/type.ts

@@ -32,7 +32,7 @@ export interface ParkingVO {
   /**
    * 住户id
    */
-  residentId: string | number;
+  residentId: string;
 
   /**
    * 添加时间
@@ -88,7 +88,7 @@ export interface ParkingForm extends BaseEntity {
   /**
    * 住户id
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 添加时间
@@ -160,7 +160,7 @@ export interface ParkingQuery extends PageQuery {
   /**
    * 住户id
    */
-  residentId?: string | number;
+  residentId?: string;
 
   /**
    * 添加时间

src/api/system/report/LeaseManagementDetails/index.ts

@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+import {
+  leaseManagementDetailChargeTypesResponse,
+  leaseManagementDetailRequest,
+  leaseManagementDetailResponse
+} from '@/api/system/report/LeaseManagementDetails/type';
+
+export const getLeaseManagementDetailList = (data?: leaseManagementDetailRequest): Promise<leaseManagementDetailResponse> => {
+  return request({
+    url: '/leaseManagementDetail/list',
+    method: 'POST',
+    data: data
+  });
+};
+export const getLeaseManagementDetailChargeTypesList = (): Promise<leaseManagementDetailChargeTypesResponse> => {
+  return request({
+    url: '/leaseManagementDetail/chargeTypes',
+    method: 'POST'
+  });
+};

src/api/system/report/LeaseManagementDetails/type.ts

@@ -0,0 +1,203 @@
+export type leaseManagementDetailRequest = {
+  /**
+   * 面积
+   */
+  areaSize?: string;
+  /**
+   * 收费模式多选
+   */
+  chargeModes?: string[];
+  /**
+   * 收费标准多选
+   */
+  chargeStandards?: string[];
+  /**
+   * 按收费类型筛选应收/已收/未收金额区间
+   */
+  chargeTypeFilters?: ChargeTypeFilter[];
+  /**
+   * 租赁起始日-开始
+   */
+  leaseStartDateBegin?: string;
+  /**
+   * 租赁起始日-结束
+   */
+  leaseStartDateEnd?: string;
+  /**
+   * 承租方
+   */
+  lessee?: string;
+  /**
+   * 当前页码
+   */
+  pageNum: number;
+  /**
+   * 每页条数
+   */
+  pageSize: number;
+  /**
+   * 手机号
+   */
+  phone?: string;
+  /**
+   * 房号
+   */
+  roomNumber?: string;
+  /**
+   * 小区多选
+   */
+  villageIds?: number[];
+
+  leaseEndDateBegin?: string;
+  leaseEndDateEnd?: string;
+};
+
+export type ChargeTypeFilter = {
+  /**
+   * 收费类型名称
+   */
+  chargeTypeName?: string;
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId?: string;
+  /**
+   * 应收上限
+   */
+  receivableMax?: string;
+  /**
+   * 应收下限
+   */
+  receivableMin?: string;
+  /**
+   * 已收上限
+   */
+  receivedMax: string;
+  /**
+   * 已收下限
+   */
+  receivedMin: string;
+  /**
+   * 未收上限
+   */
+  uncollectedMax: string;
+  /**
+   * 未收下限
+   */
+  uncollectedMin: string;
+};
+
+export type leaseManagementDetailResponse = {
+  /**
+   * 收费类型
+   */
+  chargeItems: ChargeItem[];
+  code: number;
+  msg: string;
+  /**
+   * 当前页明细行数据
+   */
+  rows: Row[];
+  /**
+   * 总记录数
+   */
+  total: number;
+};
+
+export type ChargeItem = {
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId: string;
+  /**
+   * 收费类型名称
+   */
+  chargeTypeName: string;
+};
+
+export type Row = {
+  /**
+   * 小区名称
+   */
+  area: string;
+  /**
+   * 面积（㎡）
+   */
+  areaSize: string;
+  /**
+   * 小区ID
+   */
+  buildingId: string;
+  /**
+   * 收费模式
+   */
+  chargeMode: string;
+  /**
+   * 收费标准
+   */
+  chargeStandard: string;
+  /**
+   * 房屋ID
+   */
+  houseId: string;
+  /**
+   * 签约记录ID
+   */
+  id: string;
+  /**
+   * 租赁终止日
+   */
+  leaseEndDate: string;
+  /**
+   * 租赁起始日
+   */
+  leaseStartDate: string;
+  /**
+   * 承租方
+   */
+  lessee: string;
+  /**
+   * 电话
+   */
+  phone: string;
+  /**
+   * 各收费类型应收
+   */
+  receivableAmounts: { [key: string]: any };
+  /**
+   * 各收费类型已收
+   */
+  receivedAmounts: { [key: string]: any };
+  /**
+   * 房号
+   */
+  roomNumber: string;
+  /**
+   * 各收费类型未收
+   */
+  uncollectedAmounts: { [key: string]: any };
+  [property: string]: any;
+};
+
+export type leaseManagementDetailChargeTypesResponse = {
+  code: number;
+  data: Datum[];
+  msg: string;
+};
+
+export type Datum = {
+  chargeTypeId: string;
+  chargeTypeName: string;
+};
+
+// 0000000000000000
+export interface queryParamsType extends leaseManagementDetailRequest {
+  chargeTypeFilters: chargeTypeFiltersType[];
+}
+
+export interface chargeTypeFiltersType extends ChargeTypeFilter {
+  receivable?: string;
+  uncollected?: string;
+  received?: string;
+  chargeTypeName?: string;
+}

src/api/system/report/aging/index.ts

@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+import { AgingListResponse, OwnerArrearsDetailVo } from '@/api/system/report/aging/type';
+import { AxiosPromise } from 'axios';
+
+export const getAgingList = (query): Promise<AgingListResponse> => {
+  return request({
+    url: '/agingAnalysis/summary',
+    method: 'get',
+    params: query
+  });
+};
+
+
+export const getDetailList = (query): Promise<AgingListResponse> => {
+  return request({
+    url: '/agingAnalysis/detail',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/report/aging/type.ts

@@ -0,0 +1,74 @@
+export interface AgingListResponse {
+  total: number;
+  rows: AgingSummary[];
+  summary: AgingSummary;
+  code: number;
+  msg: string;
+}
+
+export interface AgingSummary {
+  amountLe6: string;
+  amountM6To12: string;
+  amountOver5: string;
+  amountY1To2: string;
+  amountY2To3: string;
+  amountY3To4: string;
+  amountY4To5: string;
+  cutoffPeriod: string;
+  houseTypeName: string;
+  totalAmount: string;
+  villageName: string;
+}
+// 明细    ---------------------------------
+/**
+ * 业主欠费明细视图对象
+ *
+ * OwnerArrearsDetailVo
+ */
+export type OwnerArrearsDetailVo = {
+  /**
+   * 区域（小区名称）
+   */
+  area?: string;
+  /**
+   * 欠费月数
+   */
+  arrearsMonths?: number;
+  /**
+   * 应账账期（如：20170101-20171231）
+   */
+  billPeriod?: string;
+  /**
+   * 客户（业主姓名）
+   */
+  customerName?: string;
+  /**
+   * 垃圾清运费
+   */
+  garbageFee?: number;
+  /**
+   * 房号
+   */
+  houseNo?: string;
+  /**
+   * 其他费用合计
+   */
+  otherFee?: number;
+  /**
+   * 联系电话
+   */
+  phone?: string;
+  /**
+   * 物业费
+   */
+  propertyFee?: number;
+  /**
+   * 序号
+   */
+  serialNumber?: number;
+  /**
+   * 金额合计
+   */
+  totalAmount?: number;
+  [property: string]: any;
+};

src/api/system/report/arrears/arrears.ts

@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+import { ArrearsDetailQuery, ArrearsListResponse, ArrearsQuery, OwnerArrearsDetailVo } from '@/api/system/report/arrears/type';
+import { AxiosPromise } from 'axios';
+
+export const getArrearsList = (query?: ArrearsQuery): Promise<ArrearsListResponse> => {
+  return request({
+    url: '/outstandingFeeSummary/list',
+    method: 'get',
+    params: query
+  });
+};
+export const getArrearsDetails = (query?: ArrearsDetailQuery): AxiosPromise<OwnerArrearsDetailVo[]> => {
+  return request({
+    url: '/outstandingFeeSummary/ownerArrearsDetail',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/report/arrears/type.ts

@@ -0,0 +1,113 @@
+
+export interface ArrearsQuery extends PageQuery {
+  /**
+   * 视图类型：
+   * 1 - 维度一（收费类型为行）
+   * 2 - 维度二（房屋类型为行）
+   * */
+  viewType: number;
+  chargeItemId?: string;
+  houseUseId?: string;
+  villageId?: string;
+}
+
+export interface ArrearsListResponse {
+  code: number;
+  msg: string;
+  data: ArrearsVO[];
+}
+
+export interface ArrearsVO extends ArrearsType1, ArrearsType2 {
+  'villageName': string;
+  'totalAmount': string;
+}
+
+
+export interface ArrearsType1 {
+  'chargeItemName'?: string;
+  'houseTypeAmounts'?: {
+    [key: string]: string;
+  };
+}
+
+export interface ArrearsType2 {
+  'houseTypeName'?: string;
+  'chargeItemAmounts'?: {
+    [key: string]: string;
+  };
+}
+
+export interface ArrearsDetailQuery extends PageQuery {
+  /**
+   * 客户姓名（模糊查询）
+   */
+  customerName?: string;
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+  /**
+   * 房号（模糊查询）
+   */
+  houseNo?: string;
+  /**
+   * 联系电话（模糊查询）
+   */
+  phone?: string;
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+}
+/**
+ * 业主欠费明细视图对象
+ *
+ * OwnerArrearsDetailVo
+ */
+export type OwnerArrearsDetailVo = {
+  /**
+   * 区域（小区名称）
+   */
+  area?: string;
+  /**
+   * 欠费月数
+   */
+  arrearsMonths?: number;
+  /**
+   * 应账账期（如：20170101-20171231）
+   */
+  billPeriod?: string;
+  /**
+   * 各收费类型金额（key: 收费类型名称, value: 金额）
+   */
+  chargeItemAmounts?: MapBigDecimal;
+  /**
+   * 客户（业主姓名）
+   */
+  customerName?: string;
+  /**
+   * 房号
+   */
+  houseNo?: string;
+  /**
+   * 联系电话
+   */
+  phone?: string;
+  /**
+   * 序号
+   */
+  serialNumber?: number | string;
+  /**
+   * 金额合计
+   */
+  totalAmount?: number;
+};
+
+/**
+ * 各收费类型金额（key: 收费类型名称, value: 金额）
+ *
+ * MapBigDecimal
+ */
+export type MapBigDecimal = {
+  [property: string]: number;
+};

src/api/system/report/arrearsTrend/index.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getArrearsTend = (query) => {
+  return request({
+    url: '/propertyFeeTrend/arrearsTrend',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/report/businessDailyReport/index.ts

@@ -0,0 +1,54 @@
+import request from '@/utils/request';
+import { Response } from '@/api/system/report/businessDailyReport/type';
+
+/**
+ * 按小区统计
+ * @param query
+ * @returns
+ * */
+export const getBusinessDailyReport = (query): Promise<Response> => {
+  return request({
+    url: '/businessDailyReport/village',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 按小区统计导出
+ * @param query
+ * @returns
+ * */
+export const getBusinessDailyReportExport = (query): Promise<Response> => {
+  return request({
+    url: '/businessDailyReport/village/export',
+    method: 'get',
+    params: query
+  });
+};
+
+
+
+/**
+ * 按收费项目统计
+ * @param query
+ * @returns
+ * */
+export const getBusinessDailyReportChargeItem = (query): Promise<Response> => {
+  return request({
+    url: '/businessDailyReport/chargeItem',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 按收费项目统计导出
+ * @param query
+ * @returns
+ * */
+export const getBusinessDailyReportChargeItemExport = (query): Promise<Response> => {
+  return request({
+    url: '/businessDailyReport/chargeItem/export',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/report/businessDailyReport/type.ts

@@ -0,0 +1,77 @@
+export type Response = {
+  code: number;
+  msg: string;
+  /**
+   * 支付方式
+   */
+  payTypes: PayType[];
+  /**
+   * 数据列表
+   */
+  rows: RowsType[];
+  /**
+   * 合计行
+   */
+  summary: Summary;
+  total: number;
+};
+
+export type RowsType = Row | RowVillage;
+
+export type Row = {
+  /**
+   * 收费项目ID
+   */
+  chargeItemId: string;
+  /**
+   * 收费项目名称
+   */
+  chargeItemName: string;
+  /**
+   * 各支付方式金额
+   */
+  payAmounts: { [key: string]: string };
+  /**
+   * 合计金额
+   */
+  totalAmount: string;
+};
+
+export type RowVillage = {
+  /**
+   * 各支付方式金额
+   */
+  payAmounts?: { [key: string]: string };
+  /**
+   * 合计金额
+   */
+  totalAmount?: number;
+  /**
+   * 小区ID
+   */
+  villageId?: number;
+  /**
+   * 小区名称
+   */
+  villageName?: string;
+};
+
+export type PayType = {
+  /**
+   * 支付方式编码
+   */
+  payType: string;
+  /**
+   * 支付方式名称
+   */
+  payTypeName: string;
+};
+/**
+ * 合计行
+ */
+export type Summary = {
+  chargeItemId: null;
+  chargeItemName: string;
+  payAmounts: { [key: string]: string };
+  totalAmount: string;
+};

src/api/system/report/chargeTrend/index.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getChargeTend = (query)=> {
+  return request({
+    url: '/propertyFeeTrend/chargeTrend',
+    method: 'get',
+    params: query
+  });
+};

src/api/system/report/dailyFeeReport/index.ts

@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+import { FilterResponse, Response } from '@/api/system/report/dailyFeeReport/type';
+
+export const getDailyFeeReportList = (data = {}): Promise<Response> => {
+  return request({
+    url: '/dailyFeeReport/list',
+    method: 'POST',
+    data: data
+  });
+};
+// 获取动态查询数据
+export const getDailyFeeReportDynamicList = (data = {}): Promise<FilterResponse> => {
+  return request({
+    url: '/dailyFeeReport/filters',
+    method: 'GET',
+    data: data
+  });
+};

src/api/system/report/dailyFeeReport/type.ts

@@ -0,0 +1,44 @@
+export type Response = {
+  code: number;
+  rows: Datum[];
+  total: number;
+  msg: string;
+};
+
+export type Datum = {
+  alipayAmount: string;
+  cashAmount: string;
+  chargeTypeAmounts: ChargeTypeAmounts;
+  deposit: string;
+  depositAmount: string;
+  discountAmount: string;
+  electricFee: string;
+  handler: null | string;
+  houseName: string;
+  payTime: string;
+  propertyOffsetAmount: string;
+  remark: null;
+  residentName: string;
+  transferAmount: string;
+  unionPayAmount: string;
+  waterFee: string;
+  wechatAmount: string;
+  yiDangFuAmount: string;
+};
+
+export type ChargeTypeAmounts = {
+  [property: string]: {
+    amount?: string;
+    endDate?: string;
+    startDate?: string;
+  };
+};
+
+export type FilterResponse = {
+  code: number;
+  data: {
+    'chargeTypeId': string;
+    'chargeTypeName': string;
+  }[];
+  msg: string;
+};

src/api/system/report/monthFeeReport/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { MonthFeeReportQueryForm, Response } from '@/api/system/report/monthFeeReport/type';
+
+export const getMonthFeeReportList = (data: MonthFeeReportQueryForm = {}): Promise<Response> => {
+  return request({
+    url: '/chargeMonthlyReport/list',
+    method: 'GET',
+    params: data
+  });
+};

src/api/system/report/monthFeeReport/type.ts

@@ -0,0 +1,75 @@
+
+export type MonthFeeReportQueryForm = {
+  /**
+   * 房屋用途类型
+   */
+  buildingIds?: string;
+  /**
+   * 月收费率区间
+   */
+  monthRate?: string;
+  /**
+   * 本月应收区间
+   */
+  monthReceivable?: string;
+  /**
+   * 本月未收区间
+   */
+  monthUnpaid?: string;
+  /**
+   * 当前页码
+   */
+  pageNum?: number;
+  /**
+   * 每页条数
+   */
+  pageSize?: number;
+  /**
+   * 综合欠收区间
+   */
+  totalArrears?: string;
+  /**
+   * 综合预收区间
+   */
+  totalPrepaid?: string;
+  /**
+   * 小区ID
+   */
+  villageId?: string;
+  /**
+   * 年收费率区间
+   */
+  yearRate?: string;
+  /**
+   * 本年应收区间
+   */
+  yearReceivable?: string;
+  /**
+   * 本年未收区间
+   */
+  yearUnpaid?: string;
+};
+export type Response = {
+  code: number;
+  msg: string;
+  rows: Row[];
+  total: number;
+};
+
+export type Row = {
+  buildingId: BuildingId;
+  buildingName: string;
+  monthRate: string;
+  monthReceivable: string;
+  monthReceived: string;
+  monthUnpaid: string;
+  totalArrears: string;
+  totalPrepaid: string;
+  yearRate: string;
+  yearReceivable: string;
+  yearReceived: string;
+  yearUnpaid: string;
+  [property: string]: any;
+};
+
+export type BuildingId = number | string;

src/api/system/report/paidInExpenses/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { Response } from '@/api/system/report/paidInExpensesReceivable/type';
+
+export const getPaidInExpensesList = (data): Promise<Response> => {
+  return request({
+    url: '/paidInExpenses/list',
+    method: 'POST',
+    data: data
+  });
+};

src/api/system/report/paidInExpenses/type.ts

@@ -0,0 +1,29 @@
+export type Response = {
+  code: number;
+  data: Data;
+  msg: string;
+};
+
+export type Data = {
+  chargeTypes: string[];
+  details: Detail[];
+  total: Total;
+};
+
+export type Detail = {
+  amounts: DetailAmounts;
+  name: string;
+  sequence: string;
+  total: string;
+};
+
+export type DetailAmounts = {
+  [property: string]: string;
+};
+
+export type Total = {
+  amounts: DetailAmounts;
+  name: string;
+  sequence: string;
+  total: string;
+};

src/api/system/report/paidInExpensesReceivable/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { Response } from '@/api/system/report/paidInExpensesReceivable/type';
+
+export const getPaidInExpensesReceivableList = (data): Promise<Response> => {
+  return request({
+    url: '/paidInExpenses/receivable/list',
+    method: 'POST',
+    data: data
+  });
+};

src/api/system/report/paidInExpensesReceivable/type.ts

@@ -0,0 +1,29 @@
+export type Response = {
+  code: number;
+  data: Data;
+  msg: string;
+};
+
+export type Data = {
+  chargeTypes: string[];
+  details: Detail[];
+  total: Total;
+};
+
+export type Detail = {
+  amounts: DetailAmounts;
+  name: string;
+  sequence: string;
+  total: string;
+};
+
+export type DetailAmounts = {
+  [property: string]: string;
+};
+
+export type Total = {
+  amounts: DetailAmounts;
+  name: string;
+  sequence: string;
+  total: string;
+};

src/api/system/report/prepaidBalance/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { Request, Response } from '@/api/system/report/prepaidBalance/type';
+
+export const getPrepaidBalanceList = (query: Request): Promise<Response> => {
+  return request({
+    url: '/prepaidBalance/summary',
+    method: 'GET',
+    params: query
+  });
+};

src/api/system/report/prepaidBalance/type.ts

@@ -0,0 +1,83 @@
+export type Request = {
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId?: string;
+  /**
+   * 房屋类型ID
+   */
+  houseUseTypeId?: string;
+  /**
+   * 当前页数
+   */
+  pageNum?: number;
+  /**
+   * 分页大小
+   */
+  pageSize?: number;
+  /**
+   * 小区ID
+   */
+  villageId?: string;
+};
+
+export type Response = {
+  /**
+   * 动态收费项目列头
+   */
+  chargeItems: ChargeItem[];
+  code: number;
+  msg: string;
+  /**
+   * 汇总数据行列表
+   */
+  rows: Row[];
+  /**
+   * 全部合计行
+   */
+  summary: Summary;
+  /**
+   * 总记录数
+   */
+  total: number;
+};
+
+export type ChargeItem = {
+  /**
+   * 收费项目名称
+   */
+  chargeItemName: string;
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId: number;
+};
+
+export type Row = {
+  /**
+   * 各收费项目预收余额
+   */
+  chargeItemAmounts?: { [key: string]: any };
+  /**
+   * 房屋类型名称
+   */
+  houseTypeName?: string;
+  /**
+   * 合计金额
+   */
+  totalAmount?: number;
+  /**
+   * 小区名称
+   */
+  villageName?: string;
+};
+
+/**
+ * 全部合计行
+ */
+export type Summary = {
+  chargeItemAmounts: { [key: string]: string };
+  houseTypeName: string;
+  totalAmount: number;
+  villageName: string;
+};

src/api/system/report/prepaidBalanceDetail/index.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+import { Request, Response } from '@/api/system/report/prepaidBalance/type';
+
+export const getPrepaidBalanceDetailList = (query: Request): Promise<Response> => {
+  return request({
+    url: '/prepaidBalance/detail',
+    method: 'GET',
+    params: query
+  });
+};

src/api/system/report/prepaidBalanceDetail/type.ts

@@ -0,0 +1,83 @@
+export type Request = {
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId?: string;
+  /**
+   * 房屋类型ID
+   */
+  houseUseTypeId?: string;
+  /**
+   * 当前页数
+   */
+  pageNum?: number;
+  /**
+   * 分页大小
+   */
+  pageSize?: number;
+  /**
+   * 小区ID
+   */
+  villageId?: string;
+};
+
+export type Response = {
+  /**
+   * 动态收费项目列头
+   */
+  chargeItems: ChargeItem[];
+  code: number;
+  msg: string;
+  /**
+   * 汇总数据行列表
+   */
+  rows: Row[];
+  /**
+   * 全部合计行
+   */
+  summary: Summary;
+  /**
+   * 总记录数
+   */
+  total: number;
+};
+
+export type ChargeItem = {
+  /**
+   * 收费项目名称
+   */
+  chargeItemName: string;
+  /**
+   * 收费类型ID
+   */
+  chargeTypeId: number;
+};
+
+export type Row = {
+  /**
+   * 各收费项目预收余额
+   */
+  chargeItemAmounts?: { [key: string]: any };
+  /**
+   * 房屋类型名称
+   */
+  houseTypeName?: string;
+  /**
+   * 合计金额
+   */
+  totalAmount?: number;
+  /**
+   * 小区名称
+   */
+  villageName?: string;
+};
+
+/**
+ * 全部合计行
+ */
+export type Summary = {
+  chargeItemAmounts: { [key: string]: string };
+  houseTypeName: string;
+  totalAmount: number;
+  villageName: string;
+};

src/api/system/residentReviewProcess/resident/index.ts

@@ -1,14 +1,13 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/resident/type';
+import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/residentReviewProcess/resident/type';
 
 /**
  * 查询住户管理列表
  * @param query
  * @returns {*}
  */
-
+export const listResident = (query?: ResidentQuery | {}): AxiosPromise<ResidentVO[]> => {
-export const listResident = (query?: ResidentQuery): AxiosPromise<ResidentVO[]> => {
   return request({
     url: '/resident/list',
     method: 'get',
@@ -64,7 +63,6 @@ export const delResident = (id: string | number | Array<string | number>) => {
 
 /**
  * 添加住户管理-上传身份证
- * @param id
  */
 export const UploadidCardApi = () => {
   return request({

src/api/system/residentReviewProcess/resident/type.ts

@@ -2,8 +2,10 @@ export interface ResidentVO {
   /**
    * 主键  住户管理id
    */
-  userId: string | number;
+  userId: string;
   id: string;
+  unitNoId: string;
+  idCardType: string;
   /**
    * 住户编号
    */
@@ -13,6 +15,7 @@ export interface ResidentVO {
    * 姓名
    */
   name: string;
+  nickName: string;
 
   /**
    * 0 业主  1 租户
@@ -22,12 +25,12 @@ export interface ResidentVO {
   /**
    * 0 男性 1 女性
    */
-  gender: number;
+  gender: string;
 
   /**
    * 身份证号
    */
-  idCard: string | number;
+  idCard: string;
 
   /**
    * 手机号码
@@ -42,7 +45,7 @@ export interface ResidentVO {
   /**
    * 楼栋id
    */
-  buildingId: string | number;
+  buildingId: string;
 
   /**
    * 房屋表id
@@ -74,11 +77,22 @@ export interface ResidentVO {
 }
 
 export interface ResidentForm extends BaseEntity {
+  /**
+   * 年龄
+   */
+  age?: number;
   /**
    * 主键  住户管理id
    */
-  userId?: string | number;
+  userId?: string;
-
+  unitNoId?: string;
+  /**
+   * 证件类型
+   * 0 身份证
+   * 1 护照
+   * 2 港澳通行证
+   */
+  idCardType?: string;
   /**
    * 住户编号
    */
@@ -90,19 +104,22 @@ export interface ResidentForm extends BaseEntity {
   name?: string;
 
   /**
-   * 0业主  1租户
+   * 0 业主
+   * 1 亲属
+   * 2 租户
+   * 3 朋友
    */
-  type?: string;
+  ownerRelationship?: string;
 
   /**
    * 0 男性 1 女性
    */
-  gender?: number;
+  gender?: string;
 
   /**
    * 身份证号
    */
-  idCard?: string | number;
+  idCard?: string;
 
   /**
    * 手机号码
@@ -117,7 +134,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 楼栋id
    */
-  buildingId?: string | number;
+  buildingId?: string;
 
   /**
    * 房屋表id
@@ -150,12 +167,21 @@ export interface ResidentQuery extends PageQuery {
    * 日期范围参数
    */
   date?: any;
-
   /**
-   * 住户类型
+   * 房屋名称
-   * 0业主  1租户
    */
-  type?: string;
+  houseName?: string;
+  /**
+   * 姓名
+   */
+  name?: string;
+  /**
+   * 0 业主
+   * 1 亲属
+   * 2 租户
+   * 3 朋友
+   */
+  ownerRelationship?: string;
   /**
    * 住户状态
    * 0 审核中 1 已认证
@@ -165,5 +191,5 @@ export interface ResidentQuery extends PageQuery {
   houseId?: number;
   villageId?: string;
   buildingId?: number;
-  unitNo?: number;
+  unitNoId?: number;
 }

src/api/system/residentReviewProcess/type.ts

@@ -1,140 +0,0 @@
-export interface ResidentReviewProcessVO {
-  /**
-   * 住户审核表
-   */
-  id: string | number;
-
-  /**
-   * 住户表id
-   */
-  residentId: string | number;
-
-  /**
-   * 提交时间
-   */
-  submitTime: string;
-
-  /**
-   * 提交状态  0未提交  1已提交
-   */
-  submitStatus: number;
-
-  /**
-   * 物业审核时间
-   */
-  propertyTime: string;
-
-  /**
-   * 物业审核状态 0 待审核 1审核通过 2审核未通过
-   */
-  propertyStatus: number;
-
-  /**
-   * 物业审核意见
-   */
-  propertyReviewFeedback: string;
-
-  /**
-   * 认证时间
-   */
-  certificationTime: string;
-
-  /**
-   * 认证状态 0未认证 1已认证
-   */
-  certificationStatus: number;
-}
-
-export interface ResidentReviewProcessForm extends BaseEntity {
-  /**
-   * 住户审核表
-   */
-  id?: string | number;
-
-  /**
-   * 住户表id
-   */
-  residentId?: string | number;
-
-  /**
-   * 提交时间
-   */
-  submitTime?: string;
-
-  /**
-   * 提交状态  0未提交  1已提交
-   */
-  submitStatus?: number;
-
-  /**
-   * 物业审核时间
-   */
-  propertyTime?: string;
-
-  /**
-   * 物业审核状态 0 待审核 1审核通过 2审核未通过
-   */
-  propertyStatus?: number;
-
-  /**
-   * 物业审核意见
-   */
-  propertyReviewFeedback?: string;
-
-  /**
-   * 认证时间
-   */
-  certificationTime?: string;
-
-  /**
-   * 认证状态 0未认证 1已认证
-   */
-  certificationStatus?: number;
-}
-
-export interface ResidentReviewProcessQuery extends PageQuery {
-  /**
-   * 住户表id
-   */
-  residentId?: string | number;
-
-  /**
-   * 提交时间
-   */
-  submitTime?: string;
-
-  /**
-   * 提交状态  0未提交  1已提交
-   */
-  submitStatus?: number;
-
-  /**
-   * 物业审核时间
-   */
-  propertyTime?: string;
-
-  /**
-   * 物业审核状态 0 待审核 1审核通过 2审核未通过
-   */
-  propertyStatus?: number;
-
-  /**
-   * 物业审核意见
-   */
-  propertyReviewFeedback?: string;
-
-  /**
-   * 认证时间
-   */
-  certificationTime?: string;
-
-  /**
-   * 认证状态 0未认证 1已认证
-   */
-  certificationStatus?: number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
-}

src/api/system/revenueNotice/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RevenueNoticeVO, RevenueNoticeForm, RevenueNoticeQuery } from './type';
+
+/**
+ * 查询公区收益通知列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRevenueNotice = (query?: RevenueNoticeQuery): AxiosPromise<RevenueNoticeVO[]> => {
+  return request({
+    url: '/revenueNotice/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询公区收益通知详细
+ * @param noticeId
+ */
+export const getRevenueNotice = (noticeId: string | number): AxiosPromise<RevenueNoticeVO> => {
+  return request({
+    url: '/revenueNotice/' + noticeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增公区收益通知
+ * @param data
+ */
+export const addRevenueNotice = (data: RevenueNoticeForm) => {
+  return request({
+    url: '/revenueNotice',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改公区收益通知
+ * @param data
+ */
+export const updateRevenueNotice = (data: RevenueNoticeForm) => {
+  return request({
+    url: '/revenueNotice',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除公区收益通知
+ * @param noticeId
+ */
+export const delRevenueNotice = (noticeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/revenueNotice/' + noticeId,
+    method: 'delete'
+  });
+};

src/api/system/revenueNotice/type.ts

@@ -0,0 +1,140 @@
+export interface RevenueNoticeVO {
+  /**
+   * 公告ID
+   */
+  noticeId: string | number;
+
+  /**
+   * 公告标题
+   */
+  noticeTitle: string;
+
+  /**
+   * 公告内容
+   */
+  noticeContent: string;
+
+  /**
+   * 作者
+   */
+  author: string;
+
+  /**
+   * 紧急程度 0=普通 1=紧急 2=非常紧急
+   */
+  urgencyLevel: number;
+
+  /**
+   * 发布状态 0=草稿 1=已发布
+   */
+  publishStatus: number;
+
+  /**
+   * 发布人
+   */
+  publishBy: string;
+
+  /**
+   * 发布日期
+   */
+  publishTime: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId: string | number;
+}
+
+export interface RevenueNoticeForm extends BaseEntity {
+  /**
+   * 公告ID
+   */
+  noticeId?: string | number;
+
+  /**
+   * 公告标题
+   */
+  noticeTitle?: string;
+
+  /**
+   * 公告内容
+   */
+  noticeContent?: string;
+
+  /**
+   * 作者
+   */
+  author?: string;
+
+  /**
+   * 紧急程度 0=普通 1=紧急 2=非常紧急
+   */
+  urgencyLevel?: number;
+
+  /**
+   * 发布状态 0=草稿 1=已发布
+   */
+  publishStatus?: number;
+
+  /**
+   * 发布人
+   */
+  publishBy?: string;
+
+  /**
+   * 发布日期
+   */
+  publishTime?: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId?: string | number;
+}
+
+export interface RevenueNoticeQuery extends PageQuery {
+  /**
+   * 公告标题
+   */
+  noticeTitle?: string;
+
+  /**
+   * 公告内容
+   */
+  noticeContent?: string;
+
+  /**
+   * 作者
+   */
+  author?: string;
+
+  /**
+   * 紧急程度 0=普通 1=紧急 2=非常紧急
+   */
+  urgencyLevel?: number;
+
+  /**
+   * 发布状态 0=草稿 1=已发布
+   */
+  publishStatus?: number;
+
+  /**
+   * 发布人
+   */
+  publishBy?: string;
+
+  /**
+   * 发布日期
+   */
+  publishTime?: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/system/storeroom/index.ts

@@ -61,3 +61,28 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+/**
+ * 查询小区内储藏室管理列表
+ * @returns {*}
+ * @param data
+ */
+
+export const GetVillagelistStoreroom = (
+  data: { villageid: string; unitNoId: string; houseId?: string; buildingId: string } = {
+    villageid: null,
+    buildingId: null,
+    houseId: null,
+    unitNoId: null
+  }
+): AxiosPromise<StoreroomVO[]> => {
+  return request({
+    url: `/storeroom/getList`,
+    method: 'POST',
+    data: {
+      villageId: data.villageid,
+      buildingId: data.buildingId,
+      unitNoId: data.unitNoId,
+      houseId: data.houseId
+    }
+  });
+};