Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/types",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "共用类型文件",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

types/src/interface/option.ts

@@ -1,8 +1,14 @@
 // 系统选项
-export interface IOptions {
+
+// 工程量相关选项
+export interface IQtyOption {
+  rationQtyFromBillQty: boolean; // 自动根据清单工程量填写定额工程量
+  rationQtyFromRationUnit: boolean; // 自动根据定额单位转换定额工程量
+}
+
+export interface IOption {
   ID: string;
   userID: string;
   compilationID: string;
-  rationQtyFromBillQty: boolean; // 自动根据清单工程量填写定额工程量
-  rationQtyFromRationUnit: boolean; // 自动根据定额单位转换定额工程量
+  qtyOption: IQtyOption;
 }

types/src/interface/project.ts

@@ -23,9 +23,9 @@ export interface IGLJCol {
 
 // 小数位数
 export interface IDecimal {
-  bills: { unitFee: number; totalFee: number };
-  ration: { quantity: number; unitFee: number; totalFee: number };
-  glj: { quantity: number; unitPriceHasMix: number; unitFee: number };
+  bills: { unitPrice: number; totalPrice: number };
+  ration: { quantity: number; unitPrice: number; totalPrice: number };
+  glj: { quantity: number; unitPriceHasMix: number; unitPrice: number };
   feeRate: number;
   quantityDetail: number;
   material: number; // 三材系数