船公司、场站加 shortName

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

@@ -1213,6 +1213,7 @@ export default {
         },
         // 选择框的回调
         corpChange(value, name) {
+            console.log('corpChange', value, name)
             let arr = ['hshipper', 'hconsignee', 'hnotify', 'hnotify2']
             let portArr = ['placeReceipt', 'destination', 'placeDelivery']
             let cnPorArr = ['pol', 'pod', 'pot']
@@ -1334,6 +1335,7 @@ export default {
             else if (name == 'carrier') {
                 if (!value) {
                     this.$set(this.assemblyForm, 'carrierId', '')
+                    this.$set(this.assemblyForm, 'carrierShortName', '')
                     this.$set(this.assemblyForm, 'carrierCnName', '')
                     this.$set(this.assemblyForm, 'carrierEnName', '')
                     this.$set(this.assemblyForm, 'carrierCode', '')
@@ -1341,7 +1343,9 @@ export default {
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
+                        console.log(item)
                         this.$set(this.assemblyForm, 'carrierId', item.id)
+                        this.$set(this.assemblyForm, 'carrierShortName', item.shortName ? item.shortName : item.cnName)
                         this.$set(this.assemblyForm, 'carrierCnName', item.cnName)
                         this.$set(this.assemblyForm, 'carrierEnName', item.enName)
                         this.$set(this.assemblyForm, 'carrierCode', item.code)
@@ -1421,7 +1425,8 @@ export default {
                 if (!value) {
                     this.$set(this.assemblyForm, 'cyId', '')
                     this.$set(this.assemblyForm, 'cyCode', '')
-                    this.$set(this.assemblyForm, 'cyCnName', '')
+                    this.$set(this.assemblyForm, 'cyShortName','')
+                        this.$set(this.assemblyForm, 'cyCnName', '')
                     this.$set(this.assemblyForm, 'cyEnName', '')
                     this.$set(this.assemblyForm, 'cyRemarks', '')
                     // 联系人
@@ -1431,8 +1436,10 @@ export default {
                 }
                 for (let item of this.cyData) {
                     if (item.cnName == value) {
+                        console.log(item)
                         this.$set(this.assemblyForm, 'cyId', item.id)
                         this.$set(this.assemblyForm, 'cyCode', item.code)
+                        this.$set(this.assemblyForm, 'cyShortName', item.shortName ? item.shortName : item.cnName)
                         this.$set(this.assemblyForm, 'cyCnName', item.cnName)
                         this.$set(this.assemblyForm, 'cyEnName', item.enName)
                         this.$set(this.assemblyForm, 'cyRemarks', item.details) // 客户里的详情信息

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

@@ -349,6 +349,7 @@ export default {
                 for (let item of this[name + 'Data']) {
                     if (item.cnName == value) {
                         this.$set(this.assemblyForm, 'carrierId', item.id)
+                        this.$set(this.assemblyForm, 'carrierShortName', item.shortName ? item.shortName : item.cnName)
                         this.$set(this.assemblyForm, 'carrierCnName', item.cnName)
                         this.$set(this.assemblyForm, 'carrierEnName', item.enName)
                         this.$set(this.assemblyForm, 'carrierArgreementNo', item.agreementNo)

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -859,7 +859,7 @@ export default {
                     },
                     {
                         label: "船公司",
-                        prop: "carrierEnName",
+                        prop: "carrierShortName",
                         overHidden: true,
                     },
                     {
@@ -938,7 +938,7 @@ export default {
                     },
                     {
                         label: "场站",
-                        prop: "cyEnName",
+                        prop: "cyShortName",
                         overHidden: true,
                     },
                     {