@ningboyz/types 1.0.167 → 1.0.169

package/package.json

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

package/src/card/ICardDataResponse.ts

@@ -1,8 +1,11 @@
 //#固定资产事项登记
 
+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";
 /**
 车辆保险：dataType=1加001,使用单位(unitDict)，投保单位(dddwText)，生效日期(handleAt)，到期日期(autoBxrq)
 车辆加油：dataType=1002,加油日期(handleAt)，油油号（字典）(autoJyyh)，加油容量(nowCount)
@@ -197,4 +200,37 @@ export class TDataResponse implements IDataResponse {
     result.menuUUID = card.menuUUID;
     return result;
   }
+
+  static toTravel(card: ICardMainResponse): 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.billCode = card.cardCode;
+    travel.mastName = card.mastName;
+    travel.createBy = card.createBy;
+    travel.menuUUID = card.menuUUID;
+    return travel;
+  }
+
+  /** 转换成记录日志需要的数据（第一层，不包含菜单） */
+  static toTravelData(card?: ICardMainResponse | ICardMainResponse[]): TCore.ISysTravelResponse[] {
+    if (_.isNil(card)) {
+      return [];
+    }
+    if (_.isArray(card)) {
+      return card.map((u) => {
+        return this.toTravel(u);
+      });
+    }
+    return [this.toTravel(card)];
+  }
+
+  constructor(card: Partial<IDataResponse> = {}) {
+    if (card) {
+      _.merge(this, _.pick(card, Object.keys(this)));
+    }
+  }
 }

package/src/const/const_module.ts

@@ -95,3 +95,8 @@ 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";

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/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[] = [];