Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/BookingLedger/detail/index.vue

@@ -23,6 +23,7 @@
                 @copy="copyBookingFun"
                 @addSedList="addSedList"
                 @removeOrder="removeOrderFun"
+                @frompre="frompre"
               ></operationArea>
 
               <ul class="parent-tabs-box">
@@ -48,6 +49,7 @@
                         isParent="parent"
                         @changeDetail="changeDetailFun"
                         @editLineName="editLineNameFun"
+                        
                       ></basicInfo>
                       <mailingInfo
                         ref="mailingInfo"
@@ -369,6 +371,7 @@ export default {
   },
   data() {
     return {
+      indexObject:{},
       type: this.$route.query.type || 'CMA',
       id: this.$route.query.id,
       isCopy: this.$route.query.isCopy || false,
@@ -574,6 +577,13 @@ export default {
     })
   },
   methods: {
+    frompre(data){
+      console.log('到达index',data)
+      this.$refs.basicInfo._data.frompre = data.data1
+
+      this.$refs.basicInfo.refresh()
+      this.$refs.goodsTable.tableData = data.data2
+    },
     ...mapActions(['setNeedSavePages', 'setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave']),
     getRouterHis() {
       this.inChildLoading = true

src/views/main/BookingLedger/detail/modules/basicInfo.vue

@@ -63,6 +63,7 @@
                 has-feedback
               >
                 <selectView
+                 ref="carrierid"
                   type="carrierid"
                   :defaultVal="details.carrierid"
                   searchApi="GetCarrierlist"
@@ -284,7 +285,7 @@
                     has-feedback
                     prop="voyno"
                   >
-                    <inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
+                    <inputView   ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -409,6 +410,7 @@
                   prop="shipagency"
                 >
                   <selectView
+                   ref="shipagency"
                     type="shipagency"
                     :defaultVal="details.shipagency"
                     searchApi="GetForwarderlist"
@@ -713,6 +715,7 @@ export default {
   },
   data() {
     return {
+      frompre:{},
       type: this.$route.query.type,
       basicDetails: JSON.parse(JSON.stringify(this.details)),
       labelCol: {
@@ -936,6 +939,14 @@ export default {
     this.init()
   },
   methods: {
+    refresh(){
+      this.$forceUpdate()
+      this.$refs.vesselView.value = this.frompre[0].vessel
+      this.$refs.shipagency.value =  this.frompre[0].forwarder
+      this.$refs.carrierid.value  =  this.frompre[0].carrier
+      this.$refs.voyno.value = this.frompre[0].voyno
+      console.log('this.frompre',this.frompre)
+    },
     debounce(func, wait, ...args) {
       if (timer) clearTimeout(timer)
       timer = setTimeout(() => {

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -713,7 +713,7 @@
       </template>
     </a-modal>
     <!-- 运踪弹窗 end -->
-    <pre-order ref="preOrder" :details="details"/>
+    <pre-order ref="preOrder" :details="details" @frompre="frompre"/>
   </div>
 </template>
 <script>
@@ -874,6 +874,10 @@ export default {
     }
   },
   methods: {
+    frompre(data){
+      this.$emit('frompre', data)
+      
+    },
     FnGoSendCar() {
       BookingTruckGetTruckListByBooking({ bookingId: this.id }).then(res => {
         console.log(res)

src/views/main/BookingLedger/detail/modules/preOrder.vue

@@ -1675,7 +1675,15 @@ export default {
       }
     },
     close() {
+      
       this.openPreOrderShow = false
+      let obj = {
+	data1: this.orderList,
+	data2: this.orderDetails.ediCtn
+}
+
+      this.$emit('frompre', obj)
+   
       this.orderList = []
       this.selectArr = []
       this.editIndex = 0
@@ -1697,6 +1705,7 @@ export default {
             })
             this.orderList = res.data
 						this.orderDetails = this.orderList[this.editIndex]
+            console.log('orderList==>>', this.orderList)
 					} else {
 						this.getNoDataInit()
 					}

src/views/main/BookingLedger/detail/style/cargoInfo.less

@@ -118,6 +118,7 @@
       font-size: 14px;
       line-height: 18px;
       height: 45px;
+      color: #000;
     }
   
     /deep/ .ant-form-item-label {
@@ -130,6 +131,7 @@
     }
     .line{
       height: 45px;
+      color: #000;
     }
     .cargo-mark{
       padding: 0;

src/views/main/BookingLedger/detail/style/mailingInfo.less

@@ -69,7 +69,7 @@
         display: inline-block;
         font-size: 13px;
         margin-right: 10px;
-        color: #666;
+        color: #000;
         .iconfont {
           margin-right: 4px;
           font-weight: 600;
@@ -80,6 +80,7 @@
         line-height: 22px;
         margin-left: 10px;
         margin-right: 10px;
+        color: #000;
         span {
           margin-left: 4px !important;
         }

src/views/main/BookingLedger/list/index.vue

@@ -2027,7 +2027,7 @@ export default {
 /*订舱表格内字体颜色 */
 .mblno {
   text-align: left;
-  color: @primary-color;
+  color: @primary-color !important;
   span {
     margin-right: 0.5rem;
     cursor: pointer;
@@ -2050,7 +2050,7 @@ export default {
     padding: 0 10px;
     height: 28px;
     line-height: 26px;
-
+    color:#000;
     .iconfont {
       margin-right: 6px;
     }
@@ -2733,6 +2733,9 @@ export default {
     font-size: 100px;
   }
 }
+/deep/ .content-table .vxe-body--column .vxe-cell div{
+  color: #000;
+}
 .pono {
   text-align: left;
 }