Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-28 13:41:53 +08:00
@@ -4006,8 +4006,9 @@ export default {
nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss') nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
} }
// 代替标准号 // 代替标准号
if (nowstandinfo.replaceStandNum != null) { console.log('4007',nowstandinfo.DTBJH);
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/,/ig, ',') if (nowstandinfo.DTBJH != null) {
nowstandinfo.DTBJH = nowstandinfo.DTBJH.replace(/,/ig, ',')
} }
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />') nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')