@ningboyz/types 1.0.23 → 1.0.24

package/package.json

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

package/src/card/ICardMainFindResponse.ts

@@ -0,0 +1,21 @@
+export interface IRangeVal {
+  useRange: number;
+  startVal: number;
+  endedVal: number;
+}
+
+export class TRangeVal implements IRangeVal {
+  useRange: number = 0;
+  startVal: number = 0;
+  endedVal: number = 0;
+}
+
+export interface ICardMainFindResponse {
+  cardZcyzRange: TRangeVal;
+  CardName: string;
+}
+
+export class TCardMainFindResponse implements ICardMainFindResponse {
+  cardZcyzRange: IRangeVal = new TRangeVal();
+  CardName: string = "";
+}

package/src/card/ICardMainResponse.ts

@@ -70,6 +70,9 @@ export interface ICardMainResponse {
   cardZcyz: number;
   /** 累计折旧 */
   cardLjzj: number;
+
+  /** 固定资产-累计折旧 */
+  fromCardLjzj: number;
   /** 资产净值 */
   cardZcjz: number;
   /** 初始折旧 */
@@ -307,6 +310,9 @@ export interface ICardMainResponse {
   /** 折旧年限 */
   cardZjnx: number;
 
+  /** 挂起状态 */
+  hideStat: number;
+
   /** 单据状态 */
   fromCardStat: number;
 
@@ -406,6 +412,7 @@ export class TCardMainResponse implements ICardMainResponse {
   cardCost: number = 0;
   cardZcyz: number = 0;
   cardLjzj: number = 0;
+  fromCardLjzj: number = 0;
   cardZcjz: number = 0;
   cardCszj: number = 0;
   cardCode: string = "";
@@ -531,6 +538,8 @@ export class TCardMainResponse implements ICardMainResponse {
   cardYzje: number = 0;
   cardZjnx: number = 0;
 
+  hideStat: number = 0;
+
   lastDate: number = 0;
   lastTime: number = 0;
   flowMain: number = 0;

package/src/card/IZcbdResponse.ts

@@ -61,6 +61,9 @@ export interface IZcbdResponse {
   /** 单位名称 */
   unitText: string;
 
+  /** 挂起状态 */
+  hideStat: number;
+
   lastDate: number;
   lastTime: number;
   flowMain: number;
@@ -128,6 +131,8 @@ export class TZcbdResponse implements IZcbdResponse {
   zcbdUses: string = "";
   zcbdMemo: string = "";
 
+  hideStat: number = 0;
+
   unitText: string = "";
 
   lastDate: number = 0;

package/src/card/IZccfResponse.ts

@@ -80,6 +80,9 @@ export interface IZccfResponse {
   /** 累计折旧 */
   zccfLjzj: number;
 
+  /** 挂起状态 */
+  hideStat: number;
+
   lastDate: number;
   lastTime: number;
   flowMain: number;
@@ -159,6 +162,7 @@ export class TZccfResponse implements IZccfResponse {
   zccfZcjz: number = 0;
   /** 累计折旧 */
   zccfLjzj: number = 0;
+  hideStat: number = 0;
 
   lastDate: number = 0;
   lastTime: number = 0;

package/src/card/IZcczResponse.ts

@@ -68,6 +68,9 @@ export interface IZcczResponse {
   /** 单位名称 */
   unitText: string;
 
+  /** 挂起状态 */
+  hideStat: number;
+
   lastDate: number;
   lastTime: number;
   flowMain: number;
@@ -139,6 +142,8 @@ export class TZcczResponse implements IZcczResponse {
 
   unitText: string = "";
 
+  hideStat: number = 0;
+
   lastDate: number = 0;
   lastTime: number = 0;
   flowMain: number = 0;

package/src/card/IZcdbResponse.ts

@@ -82,6 +82,9 @@ export interface IZcdbResponse {
   /** 单位名称 */
   unitText: string;
 
+  /** 挂起状态 */
+  hideStat: number;
+
   lastDate: number;
   lastTime: number;
   flowMain: number;
@@ -155,6 +158,8 @@ export class TZcdbResponse implements IZcdbResponse {
 
   unitText: string = "";
 
+  hideStat: number = 0;
+
   lastDate: number = 0;
   lastTime: number = 0;
   flowMain: number = 0;

package/src/card/index.ts

@@ -8,11 +8,14 @@ import { IZcdbResponse, TZcdbResponse } from "./IZcdbResponse";
 import { IZclbResponse, TZclbResponse } from "./IZclbResponse";
 import { IZczjPropResponse, TZczjPropResponse } from "./IZczjPropResponse";
 import { IZczjResponse, TZczjResponse } from "./IZczjResponse";
+import { IRangeVal, ICardMainFindResponse, TRangeVal, TCardMainFindResponse } from "./ICardMainFindResponse";
 
 export {
+  type ICardMainFindResponse,
   type ICardMainResponse,
   type IGblbResponse,
   type IP4pzResponse,
+  type IRangeVal,
   type IZcbdResponse,
   type IZccfResponse,
   type IZcczResponse,
@@ -20,9 +23,11 @@ export {
   type IZclbResponse,
   type IZczjPropResponse,
   type IZczjResponse,
+  TCardMainFindResponse,
   TCardMainResponse,
   TGblbResponse,
   TP4pzResponse,
+  TRangeVal,
   TZcbdResponse,
   TZccfResponse,
   TZcczResponse,

package/src/conf/IConfig.ts

@@ -19,6 +19,7 @@ export interface IBaseConfig {
   passwordCheck: boolean;
   passwordReg: string;
   mobileCheck: boolean;
+  usesCaptcha: boolean;
 }
 
 export interface IPathConfig {

package/src/core/IDeptResponse.ts

@@ -143,7 +143,7 @@ export class TDeptResponse extends TBaseResponse<IDeptResponse[]> implements IDe
     travel.billCode = dept.deptCode;
     travel.mastName = dept.mastName;
     travel.createBy = dept.createBy;
-    travel.whatDone = whatDone;
+    travel.whatDone = `${whatDone}${dept.deptName}`;
     return travel;
   }
 

package/src/core/ILaidResponse.ts

@@ -120,7 +120,7 @@ export class TLaidResponse extends TBaseResponse<ILaidResponse> implements ILaid
     travel.billCode = laid.laidCode;
     travel.mastName = laid.mastName;
     travel.createBy = laid.createBy;
-    travel.whatDone = whatDone;
+    travel.whatDone = `${whatDone}${laid.laidName}`;
     return travel;
   }
 

package/src/core/IPartResponse.ts

@@ -70,7 +70,7 @@ export class TPartResponse implements IPartResponse {
   usesZbhd: number = 0;
   usesFlow: number = 0;
 
-  static toTravel(part: IPartResponse): TCore.ISysTravelResponse {
+  static toTravel(part: IPartResponse, buttonType: string): TCore.ISysTravelResponse {
     const travel = new TCore.TSysTravelResponse();
     travel.whoBuild = part.whoBuild;
     travel.flowMain = 0;
@@ -80,19 +80,20 @@ export class TPartResponse implements IPartResponse {
     travel.billCode = "";
     travel.mastName = part.mastName;
     travel.createBy = part.createBy;
+    travel.whatDone = `${buttonType}${part.usrPartn}`;
     return travel;
   }
 
   /** 转化成记录日志需要的数据 */
-  static toTravelData(card?: IPartResponse | IPartResponse[]): TCore.ISysTravelResponse[] {
+  static toTravelData(card: IPartResponse | IPartResponse[] | undefined, buttonType: string): TCore.ISysTravelResponse[] {
     if (_.isNil(card)) {
       return [];
     }
     if (_.isArray(card)) {
       return card.map((u) => {
-        return this.toTravel(u);
+        return this.toTravel(u, buttonType);
       });
     }
-    return [this.toTravel(card)];
+    return [this.toTravel(card, buttonType)];
   }
 }

package/src/core/IUnitResponse.ts

@@ -1,6 +1,6 @@
 import { construct, destruct } from "@aximario/json-tree";
 import _ from "lodash";
-import type { IPzptTypeResponse } from "../pzpt/IPzptTypeResponse";
+import type { IPzptTypeResponse } from "../pzpt";
 import { type IBaseResponse, TBaseResponse } from "../base/IBaseResponse";
 import type { IUnitResponseElemPara } from "./IUnitResponseElemPara";
 import { TUnitResponseElemPara } from "./IUnitResponseElemPara";
@@ -208,7 +208,7 @@ export class TUnitResponse extends TBaseResponse<IUnitResponse[]> implements IUn
     return destruct(_.cloneDeep(treeUnit), { id: "unitIndx", pid: "parentID", children: "children" }) as IUnitResponse[];
   }
 
-  static toTravel(unit: IUnitResponse): TCore.ISysTravelResponse {
+  static toTravel(unit: IUnitResponse, buttonType: string): TCore.ISysTravelResponse {
     const travel = new TCore.TSysTravelResponse();
     travel.whoBuild = unit.whoBuild;
     travel.flowMain = 0;
@@ -218,18 +218,19 @@ export class TUnitResponse extends TBaseResponse<IUnitResponse[]> implements IUn
     travel.billCode = unit.unitCode;
     travel.mastName = unit.mastName;
     travel.createBy = unit.createBy;
+    travel.whatDone = `${buttonType}${unit.unitNamf}`;
     return travel;
   }
 
-  static toTravelData(card?: IUnitResponse | IUnitResponse[]): TCore.ISysTravelResponse[] {
+  static toTravelData(card: IUnitResponse | IUnitResponse[] | undefined, buttonType: string): TCore.ISysTravelResponse[] {
     if (_.isNil(card)) {
       return [];
     }
     if (_.isArray(card)) {
       return card.map((u) => {
-        return this.toTravel(u);
+        return this.toTravel(u, buttonType);
       });
     }
-    return [this.toTravel(card)];
+    return [this.toTravel(card, buttonType)];
   }
 }

package/src/core/IUserResponse.ts

@@ -274,30 +274,31 @@ export class TUserResponse extends TBaseResponse<IUserResponse[]> implements IUs
     return construct(treeUser, { id: "userIndx", pid: "parentID", children: "children" }) as IUserResponse[];
   }
 
-  static toTravel(user: IUserResponse): TCore.ISysTravelResponse {
+  static toTravel(user: IUserResponse, buttonType: string): TCore.ISysTravelResponse {
     const travel = new TCore.TSysTravelResponse();
     travel.whoBuild = user.whoBuild;
     travel.flowMain = 0;
     travel.flowNode = 0;
     travel.billUUID = user.entityID;
     travel.billMain = user.userIndx;
-    travel.billCode = user.userCode;
+    travel.billCode = user.enrollID;
     travel.mastName = user.mastName;
     travel.createBy = user.createBy;
+    travel.whatDone = `${buttonType}${user.userName}`;
     return travel;
   }
 
   /** 转化成记录日志需要的数据 */
-  static toTravelData(card?: IUserResponse | IUserResponse[]): TCore.ISysTravelResponse[] {
+  static toTravelData(card: IUserResponse | IUserResponse[] | undefined, buttonType: string): TCore.ISysTravelResponse[] {
     if (_.isNil(card)) {
       return [];
     }
     if (_.isArray(card)) {
       return card.map((u) => {
-        return this.toTravel(u);
+        return this.toTravel(u, buttonType);
       });
     }
-    return [this.toTravel(card)];
+    return [this.toTravel(card, buttonType)];
   }
 }
 

package/src/enums/btnMode.ts

@@ -24,7 +24,7 @@ export enum TBtnActive {
 /** 按钮类型 */
 export enum TButtonType {
   /** 空 */
-  null = "null",
+  null = "",
   /** 确认 */
   confirm = "确认",
   /** 取消确认 */
@@ -94,5 +94,7 @@ export enum TButtonType {
   /** 打印设置 */
   printConfig = "打印设置",
   /** 复制 */
-  copy = "复制"
+  copy = "复制",
+  /** 计算 */
+  calculate = "计算"
 }