|
@@ -2664,7 +2664,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
for (let bill of tenderProject.Bills.datas) {
|
|
for (let bill of tenderProject.Bills.datas) {
|
|
|
//这一步设置特殊清单(各章清单合计, 100章~1200章)
|
|
//这一步设置特殊清单(各章清单合计, 100章~1200章)
|
|
|
cacheObj['_{100章以外清单合计}'] = {};
|
|
cacheObj['_{100章以外清单合计}'] = {};
|
|
|
- if (_billStrFilter(bill.name) == '第100章至700章清单' || sectionNameMap[_billStrFilter(bill.name)] || _chkAdhocChapterBill(bill)) {
|
|
|
|
|
|
|
+ if (_billStrFilter(bill.name).includes('第100章至700章清单') || sectionNameMap[_billStrFilter(bill.name)] || _chkAdhocChapterBill(bill)) {
|
|
|
if (cacheObj['_' + bill.ID]) {
|
|
if (cacheObj['_' + bill.ID]) {
|
|
|
if (!cacheObj['_' + bill.ID].hasOwnProperty('formulaCode')) {
|
|
if (!cacheObj['_' + bill.ID].hasOwnProperty('formulaCode')) {
|
|
|
cacheObj['_' + bill.ID].formulaCode = `F${cnt}`;
|
|
cacheObj['_' + bill.ID].formulaCode = `F${cnt}`;
|
|
@@ -2674,7 +2674,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (_billStrFilter(bill.name).includes('第100章至700章清单')) {
|
|
if (_billStrFilter(bill.name).includes('第100章至700章清单')) {
|
|
|
cacheObj['_{各章清单合计}'] = {};
|
|
cacheObj['_{各章清单合计}'] = {};
|
|
|
cacheObj['_{各章清单合计}'].formulaCode = `{F${cnt - 1}}`;
|
|
cacheObj['_{各章清单合计}'].formulaCode = `{F${cnt - 1}}`;
|
|
|
- } else {
|
|
|
|
|
|
|
+ } else if (!_billStrFilter(bill.name).includes('清单第100章')) {
|
|
|
billsForAcc.push(`F${cnt - 1}`);
|
|
billsForAcc.push(`F${cnt - 1}`);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|