@ningboyz/types 1.0.168 → 1.0.170

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/types",
-  "version": "1.0.168",
+  "version": "1.0.170",
   "private": false,
   "description": "宁波甬政类型库",
   "author": "nbyt-syq",

package/src/card/ICardDataResponse.ts

@@ -4,8 +4,8 @@ import _ from "lodash";
 import { IPathResponse } from "../core/IPathResponse";
 import { TFlowDataResponse } from "../flow/IFlowDataResponse";
 import * as Const from "../const";
-import {TCore} from "../../index.ts";
-import {ICardMainResponse} from "./ICardMainResponse.ts";
+import { TCore } from "../../index.ts";
+import { ICardMainResponse } from "./ICardMainResponse.ts";
 /**
 车辆保险：dataType=1加001,使用单位(unitDict)，投保单位(dddwText)，生效日期(handleAt)，到期日期(autoBxrq)
 车辆加油：dataType=1002,加油日期(handleAt)，油油号（字典）(autoJyyh)，加油容量(nowCount)
@@ -46,11 +46,14 @@ export interface IDataResponse {
   unitDict: number; //#new使用单位(字典)
   deptMain: number;
   menuUUID: string;
-  handleAt: number; //#经办时间
+  /** 经办时间|申请日期 */
+  handleAt: number;
   handleBy: string; //#经办用户
   nowCount: number; //#当前里程
-  nowMoney: number; //#保险花费
-  dataText: string; //#登记内容
+  /** 保险花费|维修金额 */
+  nowMoney: number;
+  /** 登记内容|维修原因 */
+  dataText: string;
   dataMemo: string; //#备注信息
   dddwText: string; //#定点单位
   autoJyyh: number; //#new加油油号
@@ -61,10 +64,11 @@ export interface IDataResponse {
   autoType: number;
   startDay: number;
   endedDay: number;
-  getMoney: number; //加油金额
+  getMoney: number; //#加油金额
 
   autoCpbh: string; //#车牌号
   cardName: string;
+  /** 单据编号 */
   cardCode: string;
   unitDictText: string;
   autoJyyhText: string;
@@ -76,26 +80,27 @@ export interface IDataResponse {
 
   autoClno: string; //#车架编号
 
-  doneWlzf: number; //支付确认
+  doneWlzf: number; //#支付确认
 
-  autoTbxz: number; //保险险种
+  autoTbxz: number; //#保险险种
   autoTbxzText: string;
 
   billStat: number;
   flowMain: number;
   flowNode: number;
   lastMemo: string;
-
   flowText: string;
-
   flowUser: string;
 
-  itemMain: number; //加油卡id
+  itemMain: number; //#加油卡id
   sourceND: number;
-  //虚拟字段
-  sourceNd: number;
-  ylcs: number; //月里程数
-  nclcs: number; //年初里程数
+  /** 事前标识 1:允许被关联 0:默认值 */
+  todoLock: number;
+  listLock: IDataResponse[];
+
+  //#虚拟字段
+  ylcs: number; //#月里程数
+  nclcs: number; //#年初里程数
 }
 
 export class TDataResponse implements IDataResponse {
@@ -139,7 +144,7 @@ export class TDataResponse implements IDataResponse {
   dddwText: string = "";
   startDay: number = 0;
   endedDay: number = 0;
-  getMoney: number = 0; //加油金额
+  getMoney: number = 0;
 
   autoJyyh: number = 0;
   autoBxrq: number = 0;
@@ -159,10 +164,10 @@ export class TDataResponse implements IDataResponse {
   expdCode: string = "";
   listPath: IPathResponse[] = [];
 
-  autoClno: string = ""; //#车架编号
-  doneWlzf: number = 0; //支付确认
+  autoClno: string = "";
+  doneWlzf: number = 0;
 
-  autoTbxz: number = 0; //保险险种
+  autoTbxz: number = 0;
   autoTbxzText: string = "";
 
   billStat: number = 0;
@@ -174,10 +179,14 @@ export class TDataResponse implements IDataResponse {
   itemMain: number = 0;
   sourceND: number = 0;
 
+  /** 事前标识 1:允许被关联 0:默认值 */
+  todoLock: number = 1;
+
+  listLock: IDataResponse[] = [];
+
   //虚拟字段
-  sourceNd: number = 0;
-  ylcs: number = 0; //月里程数
-  nclcs: number = 0; //年初里程数
+  ylcs: number = 0;
+  nclcs: number = 0;
 
   static toFlowData(card: TDataResponse): TFlowDataResponse {
     let result = new TFlowDataResponse();
@@ -201,13 +210,17 @@ export class TDataResponse implements IDataResponse {
     return result;
   }
 
-  static toTravel(card: ICardMainResponse): TCore.ISysTravelResponse {
+  static toFlowDatas(card: IDataResponse[]): TFlowDataResponse[] {
+    return card.map((u) => this.toFlowData(u));
+  }
+
+  static toTravel(card: IDataResponse): TCore.ISysTravelResponse {
     const travel = new TCore.TSysTravelResponse();
     travel.whoBuild = card.whoBuild;
     travel.flowMain = card.flowMain;
     travel.flowNode = card.flowNode;
     travel.billUUID = card.entityID;
-    travel.billMain = card.cardIndx;
+    travel.billMain = card.dataIndx;
     travel.billCode = card.cardCode;
     travel.mastName = card.mastName;
     travel.createBy = card.createBy;
@@ -216,7 +229,7 @@ export class TDataResponse implements IDataResponse {
   }
 
   /** 转换成记录日志需要的数据（第一层，不包含菜单） */
-  static toTravelData(card?: ICardMainResponse | ICardMainResponse[]): TCore.ISysTravelResponse[] {
+  static toTravelData(card?: IDataResponse | IDataResponse[]): TCore.ISysTravelResponse[] {
     if (_.isNil(card)) {
       return [];
     }

package/src/const/const_module.ts

@@ -97,6 +97,18 @@ export const CONST_MODULE_WARE_HOUSE_LYSH = "CONST_MODULE_WARE_HOUSE_LYSH";
 export const CONST_MODULE_WARE_HOUSE_LYQR = "CONST_MODULE_WARE_HOUSE_LYQR";
 
 /**
- * 资产维修-维修登记
+ * 资产维修-维修申请
  */
 export const CONST_MODULE_DATA_DJSQ = "CONST_MODULE_DATA_DJSQ";
+
+/**
+ * 资产维修-维修审核
+ */
+export const CONST_MODULE_DATA_DJSH = "CONST_MODULE_DATA_DJSH";
+
+
+/**
+ * 资产维修-维修登记
+ */
+export const CONST_MODULE_DATA_WXDJ = "CONST_MODULE_DATA_WXDJ";
+

package/src/expd/IExpdMainResponse.ts

@@ -8,7 +8,7 @@ import { IGamsBillResponse } from "../gams/IGamsBillResponse";
 import { IExpdCallResponse } from "./IExpdCallResponse";
 import { IUserLiteResponse } from "../core/IUserLiteResponse";
 import { IExpdCardResponse } from "./IExpdCardResponse";
-import { IZbhdMainResponese } from "../zbhd";
+import { IZbhdMainResponse } from "../zbhd";
 import { IGamsMainResponse } from "../gams";
 import { ICggzMainResponse } from "../cggz/ICggzMainResponse";
 import { IYzcgMainResponse } from "../yzcg";
@@ -231,7 +231,7 @@ export interface IExpdMainResponse {
   listWLDY: IPathResponse[];
   listYSBM: IDeptResponse[];
   listYSDW: IUnitResponse[];
-  listZBHD: IZbhdMainResponese[];
+  listZBHD: IZbhdMainResponse[];
   listZFLX: any; //支付类型
   listZNKS: any;
   listGAMS: IGamsMainResponse[];
@@ -490,7 +490,7 @@ export class TExpdMainResponse implements IExpdMainResponse {
   listWLDY: IPathResponse[] = [];
   listYSBM: IDeptResponse[] = [];
   listYSDW: IUnitResponse[] = [];
-  listZBHD: IZbhdMainResponese[] = [];
+  listZBHD: IZbhdMainResponse[] = [];
   listZFLX: any[] = [];
   listZNKS: any = [];
   listGAMS: IGamsMainResponse[] = [];

package/src/gams/IGamsBillResponse.ts

@@ -1,7 +1,7 @@
-import { IUserLiteResponse } from "../core/IUserLiteResponse";
-import { IDictResponse } from "./../core/IDictResponse";
+import { IUserLiteResponse } from "../core";
+import { IZbhdMainResponse } from "../zbhd";
+import { IDictResponse } from "../core";
 import { IGamsEachResponse } from "./IGamsEachResponse";
-import { IZbhdMainResponese } from "./IZbhdMainResponese";
 
 export interface IGamsBillResponse {
   whoBuild: number;
@@ -127,7 +127,7 @@ export interface IGamsBillResponse {
   listEach: IGamsEachResponse[]; //#标准要素
   listType: IGamsEachResponse[];
   listCLYH: IUserLiteResponse[];
-  listZBHD: IZbhdMainResponese[];
+  listZBHD: IZbhdMainResponse[];
 
   bField01: number;
   bField02: number;
@@ -298,7 +298,7 @@ export class TGamsBillResponse implements IGamsBillResponse {
   listEach: IGamsEachResponse[] = [];
   listType: IGamsEachResponse[] = [];
   listCLYH: IUserLiteResponse[] = [];
-  listZBHD: IZbhdMainResponese[] = [];
+  listZBHD: IZbhdMainResponse[] = [];
 
   bField01: number = 0; //是否单位自理 出差
   bField02: number = 0; //是否定额补贴 出差

package/src/myoa/IMyoaMainResponse.ts

@@ -10,7 +10,8 @@ import { IYzcgMainResponse } from "../yzcg/IYzcgMainResponse";
 import { IMyoaCashResponse } from "./IMyoaCashResponse";
 import { IMyoaPGDWResponse } from "./IMyoaPGDWResponse";
 import _ from "lodash";
-import {TCore} from "../../index.ts";
+import { TCore } from "../../index.ts";
+import { IMyoaRoomResponse, TMyoaRoomResponse } from "./IMyoaRoomResponse.ts";
 
 export interface IMyoaMainResponse {
   typeName: string;
@@ -127,11 +128,11 @@ export interface IMyoaMainResponse {
   /**
    * 公物仓
    * */
-  laidMain: number
+  laidMain: number;
   /**
    * 公物仓名称
    * */
-  laidText: string
+  laidText: string;
   /**
    * 入仓/领用数量
    * */
@@ -159,6 +160,7 @@ export interface IMyoaMainResponse {
 
   listLock: IMyoaMainResponse[];
   listCard: ICardMainResponse[];
+  listChat: IMyoaRoomResponse[];
   listPath: IPathResponse[];
   listSQBM: IDeptResponse[];
   listSQYH: IUserResponse[];
@@ -300,6 +302,7 @@ export class TMyoaMainResponse implements IMyoaMainResponse {
 
   listLock: IMyoaMainResponse[] = [];
   listCard: ICardMainResponse[] = [];
+  listChat: TMyoaRoomResponse[] = [];
   listPath: IPathResponse[] = [];
   listSQBM: IDeptResponse[] = [];
   listSQYH: IUserResponse[] = [];
@@ -406,9 +409,9 @@ export class TMyoaMainResponse implements IMyoaMainResponse {
     return result;
   }
 
- /**
-  * 用来记录操作
-  * */
+  /**
+   * 用来记录操作
+   * */
   static toTravel(card: IMyoaMainResponse): TCore.ISysTravelResponse {
     const travel = new TCore.TSysTravelResponse();
     travel.whoBuild = card.whoBuild;

package/src/myoa/IMyoaRoomResponse.ts

@@ -0,0 +1,76 @@
+export interface IMyoaRoomResponse {
+  whoBuild: number;
+  userIndx: number;
+  roomIndx: number;
+  parentID: number;
+  hashCode: number;
+  dataLevl: number;
+  dataFrom: number;
+  kjndKJQJ: number;
+  dataStat: number;
+  dataOrdr: number;
+  dataDate: number;
+  dataTime: number;
+  dataHide: number;
+  dataGUID: string;
+  mastName: string;
+  mastGUID: string;
+  createBy: string;
+  createAt: number;
+  updateBy: string;
+  updateAt: number;
+  deleteBy: string;
+  deleteAt: number;
+  queuesBy: number;
+  entityID: string;
+  cardType: number;
+  cardCode: string;
+  cardName: string;
+  cardMemo: string;
+  cardArea: number;
+  cardZlwz: string;
+  userSize: number;
+  cardText: string;
+}
+
+export class TMyoaRoomResponse implements IMyoaRoomResponse {
+  whoBuild: number = 0;
+  userIndx: number = 0;
+  roomIndx: number = 0;
+
+  parentID: number = 0;
+  hashCode: number = 0;
+  dataLevl: number = 0;
+  dataFrom: number = 0;
+  kjndKJQJ: number = 0;
+  dataStat: number = 0;
+  dataOrdr: number = 0;
+  dataDate: number = 0;
+  dataTime: number = 0;
+  dataHide: number = 0;
+  dataGUID: string = "";
+  mastName: string = "";
+  mastGUID: string = "";
+  createBy: string = "";
+  createAt: number = 0;
+  updateBy: string = "";
+  updateAt: number = 0;
+  deleteBy: string = "";
+  deleteAt: number = 0;
+  queuesBy: number = 0;
+  
+  entityID: string = "";
+  cardType: number = 0;
+  /** 资产编码-会议室编号 */
+  cardCode: string = "";
+  /** 资产名称-会议室名称 */
+  cardName: string = "";
+  cardMemo: string = "";
+  /** 资产面积-会议室面积 */
+  cardArea: number = 0;
+  /** 坐落位置 */
+  cardZlwz: string = "";
+  /** 容纳人数 */
+  userSize: number = 0;
+  cardText: string = "";
+}

package/src/myoa/index.ts

@@ -1,12 +1,15 @@
 import { IMyoaMainResponse, TMyoaMainResponse } from "./IMyoaMainResponse";
 import { IMyoaCashResponse, TMyoaCashResponse } from "./IMyoaCashResponse";
 import { IMyoaPGDWResponse, TMyoaPGDWResponse } from "./IMyoaPGDWResponse";
+import { IMyoaRoomResponse, TMyoaRoomResponse } from "./IMyoaRoomResponse";
 
-export {
+export { 
     type IMyoaMainResponse,
-    type IMyoaCashResponse,
-    type IMyoaPGDWResponse,
-    TMyoaMainResponse,
-    TMyoaCashResponse,
-    TMyoaPGDWResponse
+    type IMyoaCashResponse, 
+    type IMyoaPGDWResponse, 
+    type IMyoaRoomResponse, 
+    TMyoaMainResponse, 
+    TMyoaCashResponse, 
+    TMyoaPGDWResponse, 
+    TMyoaRoomResponse 
 };

package/src/yzcg/IYzcgMainResponse.ts

@@ -5,7 +5,6 @@ import { IUserLiteResponse } from "../core/IUserLiteResponse";
 import { IUserResponse } from "../core/IUserResponse";
 import { TFlowDataResponse } from "../flow/IFlowDataResponse";
 import { IGamsBillResponse } from "../gams/IGamsBillResponse";
-import { IZbhdMainResponese } from "../gams/IZbhdMainResponese";
 import { IYzcbMainResponse } from "../yzcb/IYzcbMainResponse";
 import { IYzcqMainResponse } from "../yzcq/IYzcqMainResponse";
 import { IYzcgBillResponse, TYzcgBillResponse } from "./IYzcgBillResponse";
@@ -14,6 +13,7 @@ import { IYzcgLockResponse } from "./IYzcgLockResponse";
 import { IExpdMainResponse } from "../expd/IExpdMainResponse";
 import { IYzhtMainResponse } from "../yzht/IYzhtMainResponse";
 import _ from "lodash";
+import { IZbhdMainResponse } from "../zbhd";
 
 export interface IYzcgMainResponse {
   typeName: string;
@@ -132,7 +132,7 @@ export interface IYzcgMainResponse {
   listSQBM: IDeptResponse[];
   listSQYH: IUserResponse[] | IUserLiteResponse[];
   yzcgBill: TYzcgBillResponse[];
-  listZBHD: IZbhdMainResponese[];
+  listZBHD: IZbhdMainResponse[];
   listYzcb: IYzcbMainResponse[];
   listGams: IGamsBillResponse[];
   listGshd: IYzcgGshdResponse[];
@@ -260,7 +260,7 @@ export class TYzcgMainResponse implements IYzcgMainResponse {
   listSQBM: IDeptResponse[] = [];
   listSQYH: IUserResponse[] | IUserLiteResponse[] = [];
   yzcgBill: IYzcgBillResponse[] = [];
-  listZBHD: IZbhdMainResponese[] = [];
+  listZBHD: IZbhdMainResponse[] = [];
   listYzcb: IYzcbMainResponse[] = [];
   listGams: IGamsBillResponse[] = [];
   listGshd: IYzcgGshdResponse[] = [];