|
|
@@ -155,9 +155,10 @@ INTERFACE_EXPORT = (() => {
|
|
|
"04ACFZF":"3"
|
|
|
}
|
|
|
|
|
|
- const reg1 = new RegExp('\n', 'g'), reg2 = new RegExp('\r', 'g'),
|
|
|
- reg3 = new RegExp(' ', 'g'), reg4 = new RegExp('\t', 'g'),
|
|
|
- reg5 = new RegExp('(', 'g'), reg6 = new RegExp(')', 'g')
|
|
|
+ const reg1 = new RegExp('\n', 'g'), reg2 = new RegExp('\r', 'g')
|
|
|
+ , reg3 = new RegExp(' ', 'g'), reg4 = new RegExp('\t', 'g')
|
|
|
+ , reg5 = new RegExp('(', 'g'), reg6 = new RegExp(')', 'g')
|
|
|
+ , regRt1 = new RegExp('\n\r', 'g'), regRt2 = new RegExp('\r\n', 'g')
|
|
|
;
|
|
|
|
|
|
function getBasePrice(projectGLJID, tenderProject) {
|
|
|
@@ -1480,6 +1481,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
} else {
|
|
|
jobContent = (bill.jobContentText) ? bill.jobContentText : '';
|
|
|
}
|
|
|
+ jobContent = jobContent.replace(regRt1, '
').replace(regRt2, '
').replace(reg1, '
').replace(reg2, '
'); // 转成XML的换行转义符
|
|
|
let attrs = [
|
|
|
{name: 'ItemNo', value: sno + 1},
|
|
|
{name: 'Code', value: bill.code},
|