|
|
@@ -247,7 +247,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
|
|
|
/* 投标信息 */
|
|
|
- function TouBiaoXX(CRCvals) {
|
|
|
+ function TouBiaoXX() {
|
|
|
let hardID = generateHardwareId();
|
|
|
let [cpuId, diskId, macId] = hardID.split(";");
|
|
|
|
|
|
@@ -270,9 +270,6 @@ INTERFACE_EXPORT = (() => {
|
|
|
{ name: '计算机硬件信息', value: cpuId + diskId + macId, minLen: 1 },
|
|
|
{ name: '备注', value: getValueByKey(info, '') },
|
|
|
];
|
|
|
- attrs.forEach(attr => {
|
|
|
- CRCvals.push(attr.value || '');
|
|
|
- });
|
|
|
Element.call(this, '投标信息', attrs);
|
|
|
}
|
|
|
|
|
|
@@ -756,13 +753,15 @@ INTERFACE_EXPORT = (() => {
|
|
|
const zhaoTBXX = new Element('招投标信息');
|
|
|
const gongLGCSJ = new Element('公路工程数据');
|
|
|
|
|
|
- const CRCvals = []; // 数据校验码 用
|
|
|
+ const newCRCvals = [];
|
|
|
if (isBidInvitation) {
|
|
|
zhaoTBXX.children.push(new ZhaoBiaoXX());
|
|
|
} else if (isControl) {
|
|
|
zhaoTBXX.children.push(new ZhaoBiaoKZJ());
|
|
|
} else {
|
|
|
- zhaoTBXX.children.push(new TouBiaoXX(CRCvals));
|
|
|
+ const TBInfo = new TouBiaoXX();
|
|
|
+ newCRCvals.push(_toXMLStr([TBInfo]));
|
|
|
+ zhaoTBXX.children.push(TBInfo);
|
|
|
}
|
|
|
|
|
|
const gongLGCHZ = new Element('公路工程汇总');
|
|
|
@@ -781,21 +780,14 @@ INTERFACE_EXPORT = (() => {
|
|
|
gongLBDGC,
|
|
|
hzAttrs,
|
|
|
} = createGLBDGC(tender, index + 1);
|
|
|
- hzAttrs.forEach(hzAttr => {
|
|
|
- CRCvals.push(hzAttr.value || '');
|
|
|
- });
|
|
|
gongLGCSJ.children.push(gongLBDGC);
|
|
|
const gongLGCHZMX = new Element('公路工程汇总明细', hzAttrs);
|
|
|
gongLGCHZBT.children.push(gongLGCHZMX);
|
|
|
});
|
|
|
gongLGCSJ.children.push(gongLGCHZ);
|
|
|
|
|
|
- const newCRCvals = [];
|
|
|
- newCRCvals.push(_toXMLStr([zhaoTBXX]));
|
|
|
newCRCvals.push(_toXMLStr([gongLGCHZ]));
|
|
|
- // console.log(_toXMLStr([zhaoTBXX]));
|
|
|
|
|
|
- // const md5Str = await md5(CRCvals.join(''));
|
|
|
for (let crcIdx = 0; crcIdx < newCRCvals.length; crcIdx++) {
|
|
|
newCRCvals[crcIdx] = newCRCvals[crcIdx].replace(/ /g, '').replace(/\r/g, '').replace(/\n/g, '');
|
|
|
}
|