|
@@ -1269,16 +1269,18 @@ export default {
|
|
// this.$set(this.assemblyForm.detail, name + 'Details', item.details)
|
|
// this.$set(this.assemblyForm.detail, name + 'Details', item.details)
|
|
// }
|
|
// }
|
|
var details = typeof item.details == "string" ? item.details.trim() : ""
|
|
var details = typeof item.details == "string" ? item.details.trim() : ""
|
|
- var s = typeof item.enName == "string" && item.enName.trim().toUpperCase() ? item.enName.trim() : ""
|
|
|
|
- if (s) details += `${s}\r\n`
|
|
|
|
- s = typeof item.enAddr == "string" && item.enAddr.trim() ? item.enAddr.trim().toUpperCase() : ""
|
|
|
|
- if (s) details += `${s}\r\n`
|
|
|
|
- s = typeof item.tel == "string" && item.tel.trim() ? ('TEL:' + item.tel.trim().toUpperCase()) : ""
|
|
|
|
- s += typeof item.fax == "string" && item.fax.trim() ? ((s ? " / " : "") + 'FAX:' + item.fax.trim().toUpperCase()) : ""
|
|
|
|
- if (s) details += `${s}\r\n`
|
|
|
|
- s = typeof item.email == "string" && item.email.trim() ? ('EMAIL:' + item.email.trim().toUpperCase()) : ""
|
|
|
|
- if (s) details += `${s}\r\n`
|
|
|
|
- this.$set(this.assemblyForm.detail, name + 'Details', details)
|
|
|
|
|
|
+ if(!details) {
|
|
|
|
+ var s = typeof item.enName == "string" && item.enName.trim().toUpperCase() ? item.enName.trim() : ""
|
|
|
|
+ if (s) details += `${s}\r\n`
|
|
|
|
+ s = typeof item.enAddr == "string" && item.enAddr.trim() ? item.enAddr.trim().toUpperCase() : ""
|
|
|
|
+ if (s) details += `${s}\r\n`
|
|
|
|
+ s = typeof item.tel == "string" && item.tel.trim() ? ('TEL:' + item.tel.trim().toUpperCase()) : ""
|
|
|
|
+ s += typeof item.fax == "string" && item.fax.trim() ? ((s ? " / " : "") + 'FAX:' + item.fax.trim().toUpperCase()) : ""
|
|
|
|
+ if (s) details += `${s}\r\n`
|
|
|
|
+ s = typeof item.email == "string" && item.email.trim() ? ('EMAIL:' + item.email.trim().toUpperCase()) : ""
|
|
|
|
+ if (s) details += `${s}\r\n`
|
|
|
|
+ }
|
|
|
|
+ this.$set(this.assemblyForm.detail, name + 'Details', details.trim())
|
|
|
|
|
|
// 国家名称
|
|
// 国家名称
|
|
this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
|
|
this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
|