船公司、场站加 shortName

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1259,15 +1259,27 @@ export default {
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
-                        console.log(item.cntyCode, 1231231)
+                        console.log(item, 1231231)
                         this.$set(this.assemblyForm.detail, name + 'Id', item.id)
                         this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm.detail, name + 'Code', item.code)
                         // this.$set(this.assemblyForm,name + 'Details',item.details)
-                        if (!this.assemblyForm[name + 'Details']) {
-                            this.$set(this.assemblyForm.detail, name + 'Details', item.details)
-                        }
+                        // if (!this.assemblyForm[name + 'Details']) {
+                        //     this.$set(this.assemblyForm.detail, name + 'Details', item.details)
+                        // }
+                        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)
+
                         // 国家名称
                         this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
                         // 国家代码

src/views/iosBasicData/SeafreightExportF/bills/assembly/mbinformation.vue

@@ -420,17 +420,15 @@ export default {
                         this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
 
                         var details = typeof item.details == "string" ? item.details.trim() : ""
-                        if (!details && name == 'mconsignee') {
-                            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`
-                        }
+                        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)
                     }
                 }