Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

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

@@ -143,7 +143,7 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="placeReceiptData"
-                                        :selectValue="assemblyForm.placeReceiptCode" :filterable="true"
+                                        :selectValue="assemblyForm.placeReceiptName" :filterable="true"
                                         :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择收货地"
                                         :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
@@ -175,7 +175,7 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="polData" :selectValue="assemblyForm.polCode"
+                                    <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
                                         :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                         placeholder="请选择装货港"
@@ -207,7 +207,7 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="podData" :selectValue="assemblyForm.podCode"
+                                    <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
                                         :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择卸货港"
                                         :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
@@ -238,7 +238,7 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="destinationData"
-                                        :selectValue="assemblyForm.destinationCode" :filterable="true" :clearable="true"
+                                        :selectValue="assemblyForm.destinationName" :filterable="true" :clearable="true"
                                         :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                         placeholder="请选择目的地"
@@ -271,7 +271,7 @@
                             <el-row>
                                 <el-col :span="10">
                                     <search-query :datalist="placeDeliveryData" :joinData="true"
-                                        :selectValue="assemblyForm.placeDeliveryCode" :filterable="true"
+                                        :selectValue="assemblyForm.placeDeliveryName" :filterable="true"
                                         :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                         :buttonIf="false" placeholder="请选择交货地"
                                         :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
@@ -302,7 +302,7 @@
                             </span>
                             <el-row>
                                 <el-col :span="10">
-                                    <search-query :datalist="potData" :selectValue="assemblyForm.potCode"
+                                    <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
                                         :filterable="true" :clearable="true" :remote="true" :joinData="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
                                         :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
@@ -1264,6 +1264,7 @@ export default {
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
+                        console.log(item)
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)