|
|
@@ -1326,6 +1326,31 @@ INTERFACE_EXPORT = (() => {
|
|
|
return rst;
|
|
|
}
|
|
|
|
|
|
+ function _getDayworkMapStrByBillType(billData) {
|
|
|
+ let rst = ['', ''];
|
|
|
+ if (billData && billData.flags && billData.flags.length > 0) {
|
|
|
+ for (let idx = 0; idx < billData.flags.length; idx++) {
|
|
|
+ if (billData.flags[idx].fieldName === 'fixed') {
|
|
|
+ switch(billData.flags[idx].flag) {
|
|
|
+ case 23:
|
|
|
+ rst = ["10.1", "D1"]; // 劳务
|
|
|
+ break;
|
|
|
+ case 24:
|
|
|
+ rst = ["10.2", "D2"]; // 材料
|
|
|
+ break;
|
|
|
+ case 25:
|
|
|
+ rst = ["10.3", "D3"]; // 机械
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return rst;
|
|
|
+ }
|
|
|
+
|
|
|
function bill(bNode, level) {
|
|
|
let data = bNode.data;
|
|
|
let CostKind = 3;
|
|
|
@@ -1359,7 +1384,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (ListCodeMap[data.name]) ListCode = ListCodeMap[data.name][0];
|
|
|
if (data.code && data.code != "") ListCode = data.code;
|
|
|
let formulaCode = "";
|
|
|
- if (ListCodeMap[data.name]) formulaCode = ListCodeMap[data.name][1];
|
|
|
+ if (ListCodeMap[data.name]) {
|
|
|
+ formulaCode = ListCodeMap[data.name][1];
|
|
|
+ } else {
|
|
|
+ formulaCode = _getDayworkMapStrByBillType(data)[1];
|
|
|
+ }
|
|
|
let perKeyId = '';
|
|
|
if (data.ParentID != -1) {
|
|
|
const parent = bNode.tree.findNode(bNode.data.ParentID)
|