|
@@ -236,7 +236,12 @@ const INTERFACE_EXPORT_BASE = (() => {
|
|
|
* @return {void}
|
|
* @return {void}
|
|
|
*/
|
|
*/
|
|
|
function mergeBills(source, target, parent) {
|
|
function mergeBills(source, target, parent) {
|
|
|
- source.forEach(bills => {
|
|
|
|
|
|
|
+ source.forEach((bills, index) => {
|
|
|
|
|
+ // 为了大项费用排序
|
|
|
|
|
+ if (!parent) {
|
|
|
|
|
+ bills.seq = index;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
const simpleName = bills.name ? bills.name.replace(/\s/g, '') : '';
|
|
const simpleName = bills.name ? bills.name.replace(/\s/g, '') : '';
|
|
|
let matched;
|
|
let matched;
|
|
|
if (!parent) {
|
|
if (!parent) {
|
|
@@ -288,6 +293,8 @@ const INTERFACE_EXPORT_BASE = (() => {
|
|
|
const rst = [];
|
|
const rst = [];
|
|
|
// 将提取的清单数据合并进清单模板数据
|
|
// 将提取的清单数据合并进清单模板数据
|
|
|
mergeBills(tenderBills, billsTarget, null);
|
|
mergeBills(tenderBills, billsTarget, null);
|
|
|
|
|
+ // 大项费用按照清单标题排序
|
|
|
|
|
+ billsTarget.sort((a, b) => a.seq - b.seq);
|
|
|
// 给清单设置数据
|
|
// 给清单设置数据
|
|
|
const rowCodeData = []; // 行号数据,用于转换行引用
|
|
const rowCodeData = []; // 行号数据,用于转换行引用
|
|
|
const toBeTransformBills = []; // 待转换的清单
|
|
const toBeTransformBills = []; // 待转换的清单
|