|
@@ -285,8 +285,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
//投标的时候取基本信息的makeData字段
|
|
//投标的时候取基本信息的makeData字段
|
|
|
if(isBidSubmission) makeData = _.find(baseInfo.items, { "key": "makeDate" });
|
|
if(isBidSubmission) makeData = _.find(baseInfo.items, { "key": "makeDate" });
|
|
|
// 取编制软件序列号所属单位。读取项目属性-建设项目基本信息的“投标单位”字段。该字段需要模板中新增。等确定后再修改
|
|
// 取编制软件序列号所属单位。读取项目属性-建设项目基本信息的“投标单位”字段。该字段需要模板中新增。等确定后再修改
|
|
|
- // let softwareNumHolder = _.find(baseInfo.items, { "key": "???" });
|
|
|
|
|
- let softwareNumHolder = userCompany; // userCompany是在main界面上已经有现成的(类似userAccount, userID)
|
|
|
|
|
|
|
+ let softwareNumHolder = _.find(baseInfo.items, { "key": "bidderName" });
|
|
|
|
|
+ // let softwareNumHolder = userCompany; // userCompany是在main界面上已经有现成的(类似userAccount, userID)
|
|
|
let hardID = UTIL.generateHardwareId();
|
|
let hardID = UTIL.generateHardwareId();
|
|
|
let [cpuId, diskId, macId] = hardID.split(";");
|
|
let [cpuId, diskId, macId] = hardID.split(";");
|
|
|
// const orgScretInfoStr = `SoftwareName=纵横公路工程造价管理软件,SoftwareVer=V${VERSION},SoftwareCompany=珠海纵横创新软件有限公司,SoftwareNumber=${userID},HardNumber=${diskId},MacAddress=${macId},SoftwareNumberHolder=${softwareNumHolder}`
|
|
// const orgScretInfoStr = `SoftwareName=纵横公路工程造价管理软件,SoftwareVer=V${VERSION},SoftwareCompany=珠海纵横创新软件有限公司,SoftwareNumber=${userID},HardNumber=${diskId},MacAddress=${macId},SoftwareNumberHolder=${softwareNumHolder}`
|