|
@@ -113,7 +113,7 @@ INTERFACE_IMPORT = (() => {
|
|
|
const simpleName = item.name ? item.name.replace(/\s/g, '') : '';
|
|
const simpleName = item.name ? item.name.replace(/\s/g, '') : '';
|
|
|
if (item.titleType === '1' || /100章至第700章|100章至700章/.test(simpleName)) {
|
|
if (item.titleType === '1' || /100章至第700章|100章至700章/.test(simpleName)) {
|
|
|
oneSevenBills = item;
|
|
oneSevenBills = item;
|
|
|
- } else if (/计日工合计/.test(simpleName)) {
|
|
|
|
|
|
|
+ } else if (item.titleType === '4' || /计日工合计|计日工/.test(simpleName)) {
|
|
|
dayWorkBills = item;
|
|
dayWorkBills = item;
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -137,8 +137,9 @@ INTERFACE_IMPORT = (() => {
|
|
|
const detail = '计日工信息明细';
|
|
const detail = '计日工信息明细';
|
|
|
dayWorkBills.children = extractItemsRecur(dayWorkSrc, [[title], [detail]], (src, curField) => {
|
|
dayWorkBills.children = extractItemsRecur(dayWorkSrc, [[title], [detail]], (src, curField) => {
|
|
|
const name = getValue(src, ['_名称']);
|
|
const name = getValue(src, ['_名称']);
|
|
|
|
|
+ const dataType = getValue(src, ['_数据类型']);
|
|
|
const simpleName = name ? name.replace(/\s/g, '') : ''
|
|
const simpleName = name ? name.replace(/\s/g, '') : ''
|
|
|
- if (curField === title && /计日工合计/.test(simpleName)) { // 计日工标题在根节点中已经提取了,不重复提取
|
|
|
|
|
|
|
+ if (curField === title && (dataType === '0' || /计日工合计|计日工/.test(simpleName))) { // 计日工标题在根节点中已经提取了,不重复提取
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
const item = { name };
|
|
const item = { name };
|