5.1日 暂定 水电表管理

src/api/system/Banner/type.ts

@@ -23,14 +23,14 @@ export interface BannerVO {
   /**
    * 小区id
    */
-  villageId: string | number;
+  villageId: string;
 }
 
 export interface BannerForm extends BaseEntity {
   /**
    * Banner图管理表id
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 名称
@@ -50,7 +50,7 @@ export interface BannerForm extends BaseEntity {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 }
 
 export interface BannerQuery extends PageQuery {
@@ -72,7 +72,7 @@ export interface BannerQuery extends PageQuery {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 日期范围参数

src/api/system/Decoration/type.ts

@@ -7,7 +7,7 @@ export interface DecorationVO {
   /**
    * 所属小区id
    */
-  villageId: number;
+  villageId: string;
 
   /**
    * 所属房屋id
@@ -59,7 +59,7 @@ export interface DecorationForm extends BaseEntity {
   /**
    * 所属小区id
    */
-  villageId?: number;
+  villageId?: string;
 
   /**
    * 所属房屋id
@@ -106,7 +106,7 @@ export interface DecorationQuery extends PageQuery {
   /**
    * 所属小区id
    */
-  villageId?: number;
+  villageId?: string;
 
   /**
    * 所属房屋id

src/api/system/ParkingCost/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { ParkingCostVO, ParkingCostForm, ParkingCostQuery } from '@/api/system/type';
+import { ParkingCostVO, ParkingCostForm, ParkingCostQuery } from './type';
 
 /**
  * 查询停车缴费管理列表

src/api/system/ParkingCost/type.ts

@@ -62,7 +62,7 @@ export interface ParkingCostVO {
   /**
    * 所属小区id
    */
-  villageId: string | number;
+  villageId: string;
 }
 
 export interface ParkingCostForm extends BaseEntity {
@@ -129,7 +129,7 @@ export interface ParkingCostForm extends BaseEntity {
   /**
    * 所属小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 }
 
 export interface ParkingCostQuery extends PageQuery {
@@ -186,7 +186,7 @@ export interface ParkingCostQuery extends PageQuery {
   /**
    * 所属小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 日期范围参数

src/api/system/Questionnaire/type.ts

@@ -2,12 +2,12 @@ export interface QuestionnaireVO {
   /**
    * 问卷ID
    */
-  id: string | number;
+  id: string;
 
   /**
    * 所属小区id
    */
-  villageId: string | number;
+  villageId: string;
 
   /**
    * 问卷标题
@@ -54,7 +54,7 @@ export interface QuestionnaireForm extends BaseEntity {
   /**
    * 所属小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 问卷标题
@@ -86,6 +86,8 @@ export interface QuestionnaireForm extends BaseEntity {
    */
   residents?: string;
 
+  startTime: string;
+  endTime: string;
   /**
    * 备注
    */
@@ -96,7 +98,7 @@ export interface QuestionnaireQuery extends PageQuery {
   /**
    * 所属小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 问卷标题

src/api/system/RepairProject/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { RepairProjectVO, RepairProjectForm, RepairProjectQuery } from '@/api/repairProject/types';
+import { RepairProjectVO, RepairProjectForm, RepairProjectQuery } from './type';
 
 /**
  * 查询报修维修项目管理列表

src/api/system/SdbBill/index.ts

@@ -61,3 +61,24 @@ export const delBill = (id: string | number | Array<string | number>) => {
     method: 'delete'
   });
 };
+
+export interface BillHouse {
+  'buildingName': string;
+  'houseId': number;
+  'unitNo': number;
+  'houseNo': string;
+  'floorNo': number;
+  'villageName': string;
+  'villageId': string;
+  'buildingId': string;
+  'userName': string;
+  'userId': string;
+}
+/** 查询房屋列表 */
+export const listBillHouse = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillHouse[]> => {
+  return request({
+    url: '/bill/getHouseList',
+    method: 'GET',
+    params: query
+  });
+};

src/api/system/SdbBill/type.ts

@@ -33,11 +33,11 @@ export interface BillVO {
    * 结束日期
    */
   endDate: string;
-
+  houseIds: string[];
   /**
    * 小区id
    */
-  villageId: number;
+  villageId: string;
 
   /**
    * 备注
@@ -60,6 +60,10 @@ export interface BillForm extends BaseEntity {
    * 账单编号
    */
   billCode?: string;
+  /**
+   * 账单名称
+   */
+  billName?: string;
 
   /**
    * 收费项目id
@@ -89,7 +93,7 @@ export interface BillForm extends BaseEntity {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 备注
@@ -136,7 +140,7 @@ export interface BillQuery extends PageQuery {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 创建时间

src/api/system/SdbChargeItem/type.ts

@@ -51,7 +51,7 @@ export interface ChargeItemVO {
   /**
    * 小区id
    */
-  villageId: string | number;
+  villageId: string;
 }
 
 export interface ChargeItemForm extends BaseEntity {
@@ -63,7 +63,7 @@ export interface ChargeItemForm extends BaseEntity {
   /**
    * 项目名称
    */
-  name?: string;
+  itemName?: string;
 
   /**
    * 计费方式 0单次收费 1周期收费 2仪表收费
@@ -100,17 +100,18 @@ export interface ChargeItemForm extends BaseEntity {
    */
   remark?: string;
 
+  status?: string;
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 }
 
 export interface ChargeItemQuery extends PageQuery {
   /**
    * 项目名称
    */
-  name?: string;
+  itemName?: string;
 
   /**
    * 计费方式 0单次收费 1周期收费 2仪表收费
@@ -145,7 +146,7 @@ export interface ChargeItemQuery extends PageQuery {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 日期范围参数

src/api/system/SdbWaterDevice/index.ts

@@ -85,3 +85,14 @@ export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[
     data: data
   });
 };
+/**
+ * 更新固件
+ * @param id
+ */
+export const WaterDeviceUpdateBin = (data: { deviceCodes: string[]; urlA: string; urlB: string }) => {
+  return request({
+    url: '/waterDevice/updateBin',
+    method: 'POST',
+    data: data
+  });
+};

src/api/system/Twarehouse/type.ts

@@ -54,7 +54,7 @@ export interface WarehouseForm extends BaseEntity {
   /**
    * 仓库归属id*（关联com_village）
    */
-  villageId?: number;
+  villageId?: string;
 
   /**
    * 联系人*
@@ -91,7 +91,7 @@ export interface WarehouseQuery extends PageQuery {
   /**
    * 仓库归属id*（关联com_village）
    */
-  villageId?: number;
+  villageId?: string;
 
   /**
    * 联系人*

src/api/system/community/index.ts

@@ -10,14 +10,14 @@ export function getCommunitylistAPI(): AxiosPromise<communitylist_rows_type[]> {
   });
 }
 /** 通过小区id获取小区信息 */
-export function getVillageByIdAPI(id: number): AxiosPromise<communitylist_rows_type> {
+export function getVillageByIdAPI(id: string): AxiosPromise<communitylist_rows_type> {
   return request({
     url: `/village/${id}`,
     method: 'get'
   });
 }
 /** 删除小区 */
-export function deleteVillageByIdAPI(id: number): AxiosPromise<null> {
+export function deleteVillageByIdAPI(id: string): AxiosPromise<null> {
   return request({
     url: `/village/${id}`,
     method: 'delete'
@@ -60,7 +60,7 @@ export function editVillageAPI<T>(data: T) {
   });
 }
 /**切换小区 */
-export function switchVillageAPI(villageId: number) {
+export function switchVillageAPI(villageId: string) {
   return request({
     url: `/village/switchVillage/${villageId}`,
     method: 'POST'

src/api/system/community/type.ts

@@ -1,5 +1,5 @@
 export interface communitylist_rows_type {
-  villageId: number;
+  villageId: string;
   villageName: string;
   villageCode: string;
   address: string;

src/api/system/house/index.ts

@@ -1,17 +1,15 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { addBuildingType, addHouseType, BuildingUnit, BuildingVo } from './type';
-import { number } from 'vue-types';
 
 // 楼栋---------------------------------------------------------------------------------------
 
 /** 根据 小区id 和 类型   查询楼栋信息 */
-export function getBuildinglistAPI(villageId: number, buildingUse: number): AxiosPromise<BuildingVo[]> {
+export function getBuildinglistAPI(buildingUse: string): AxiosPromise<BuildingVo[]> {
   return request({
     url: '/building/byVillage',
     method: 'get',
     params: {
-      villageId: villageId,
       buildingUse: buildingUse
     }
   });
@@ -96,7 +94,7 @@ export function EditHouseApi(data: addHouseType) {
   });
 }
 /** 根据小区id，获取当前小区的树状结构 */
-export function getVillageTree(id: number) {
+export function getVillageTree(id: string) {
   return request({
     url: `/house/villageTree/${id}`,
     method: 'GET'

src/api/system/house/type.ts

@@ -38,7 +38,7 @@ export interface BuildingVo {
   /**
    * 所属小区ID
    */
-  villageId?: number;
+  villageId?: string;
   villageName?: string;
 }
 
@@ -68,7 +68,7 @@ export interface HouseType {
 
 export interface addBuildingType {
   buildingName: string;
-  villageId?: number;
+  villageId?: string;
   buildStructure?: string;
   buildTall?: string;
   buildToward?: string;
@@ -79,7 +79,7 @@ export interface addBuildingType {
 export interface addHouseType {
   'houseId'?: string;
   'buildingId'?: string;
-  'villageId'?: number;
+  'villageId'?: string;
   'unitNo': string;
   'floorNo': string;
   'houseNo': string;

src/api/system/resident/type.ts

@@ -37,7 +37,7 @@ export interface ResidentVO {
   /**
    * 小区id
    */
-  villageId: string | number;
+  villageId: string;
 
   /**
    * 楼栋id
@@ -112,7 +112,7 @@ export interface ResidentForm extends BaseEntity {
   /**
    * 小区id
    */
-  villageId?: string | number;
+  villageId?: string;
 
   /**
    * 楼栋id
@@ -163,7 +163,7 @@ export interface ResidentQuery extends PageQuery {
   status?: string;
 
   houseId?: number;
-  villageId?: number;
+  villageId?: string;
   buildingId?: number;
   unitNo?: number;
 }

src/api/system/user/types.ts

@@ -17,10 +17,12 @@ export interface UserQuery extends PageQuery {
   userName?: string;
   nickName?: string;
   phonenumber?: string;
+  // villageIds?: string[] | number[];
+  villageIds?: string;
   status?: string;
   deptId?: string | number;
   roleId?: string | number;
-  userIds?:  string | number | (string | number)[] | undefined;
+  userIds?: string | number | (string | number)[] | undefined;
 }
 
 /**
@@ -48,6 +50,7 @@ export interface UserVO extends BaseEntity {
   postIds: any;
   roleId: any;
   admin: boolean;
+  villageIds: string;
 }
 
 /**
@@ -59,6 +62,8 @@ export interface UserForm {
   deptId?: number;
   userName: string;
   nickName?: string;
+  // villageIds: string[] | number[];
+  villageIds: string;
   password: string;
   phonenumber?: string;
   email?: string;