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

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

@@ -471,7 +471,31 @@ export default {
               </span>
             )
           }
-        }
+        },
+        // {
+        //   field: 'weighdate',
+        //   key: 'weighdate',
+        //   title: '称重日期',
+        //   align: 'left',
+        //   width: 120,
+        //   edit: false,
+        //   renderBodyCell: ({ row, column, rowIndex }, h) => {
+        //     return (
+        //       <a-date-picker on-change={(date, dateString) => {
+        //         console.log('== 选择日期 ==', dateString)
+        //         this.tableData[rowIndex].weighdate = dateString
+        //         row['weighdate'] = dateString
+        //       }} />
+        //     )
+        //   },
+        //   renderHeaderCell: ({ column }, h) => {
+        //     return (
+        //       <span class="text-bold" style="text-align: center;">
+        //         {this.rules.weightype.required ? <i style="color: #f00">*</i> : ''} {column.title}
+        //       </span>
+        //     )
+        //   }
+        // },
       ],
       modelColumns: [
         {

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

@@ -405,7 +405,7 @@
       <!-- v-show="goodStatusShow" -->
       <div
         class="goods-hovers-list"
-        :class="{ 'hide-goods-hover': !goodStatusShow }"
+        :class="[{ 'hide-goods-hover': !goodStatusShow }, {'seat-top': goodStatusSeat === 'top'}, {'seat-bottom': goodStatusSeat === 'bottom'}]"
         :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }"
       >
         <div class="title">货运动态</div>
@@ -768,6 +768,7 @@ export default {
       goodStatusScreenX: 0,
       goodStatusScreenY: 0,
       goodStatusData: null,
+      goodStatusSeat: 'bottom',
       editingForm: this.$form.createForm(this),
       vesselData: [],
       WebVessel: '',
@@ -1628,8 +1629,15 @@ export default {
         // this.goodStatusScreenX = e.pageX - 300
         this.goodStatusScreenX = e.pageX - 139
       }
+      console.log('== 距离 ==', e.pageY, window.innerHeight - 350)
+      if (e.pageY > (window.innerHeight - 340)) {
+        this.goodStatusScreenY = e.pageY - 370 - 10
+        this.goodStatusSeat = 'top'
+      } else {
+        this.goodStatusScreenY = e.pageY + 25
+        this.goodStatusSeat = 'bottom'
+      }
       // this.goodStatusScreenY = e.pageY + 20
-      this.goodStatusScreenY = e.pageY + 25
       this.goodStatusData = data.goodsStatusList
       this.goodStatusShow = true
     },
@@ -2311,7 +2319,7 @@ export default {
     .active {
       cursor: pointer;
       // color: @primary-color;
-      color: #004d11;
+      color: #336600;
     }
   }
 }
@@ -2349,7 +2357,7 @@ export default {
     .active {
       cursor: pointer;
       // color: @primary-color;
-      color: #004d11;
+      color: #336600;
     }
     &:nth-of-type(3) {
       i {
@@ -2572,6 +2580,14 @@ export default {
   transition: 0.5s all;
   display: block;
   opacity: 1;
+   &.seat-top{
+    &::before {
+      display: none;
+      // content: '';
+      // bottom: -15px;
+      // left: 50%;
+    }
+  }
   &.hide-goods-hover {
     display: none;
     opacity: 0;
@@ -2592,6 +2608,7 @@ export default {
     left: 50%;
     margin-left: -16px;
   }
+ 
   .title {
     height: 30px;
     line-height: 30px;

src/views/main/BookingLedger/list/modules/formLabel.vue

@@ -94,7 +94,7 @@
 import { AutoComplete } from 'ant-design-vue'
 import inputView from '../components/inputView'
 import datePickerView from '../components/datePickerView'
-
+import { mapGetters } from 'vuex'
 let timer;
 export default {
   components: {
@@ -162,6 +162,9 @@ export default {
       dataSourceList: []
     }
   },
+  computed: {
+    ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData'])
+  },
   mounted() { },
   methods: {
     debounce (func, wait, ...args) {
@@ -276,10 +279,18 @@ export default {
     },
     completeChangeFirst (value) {
       if (this.value) { return false }
-      this.$emit('getCompleteList', {
-        form: this.labelData,
-        value: value || ''
-      })
+      // 这里未完成，先改用户问题
+      // console.log(this.type, this.bookingInitData)
+      // const label = this.labelData.label.toLowerCase()
+      // const arr = this.bookingInitData[`${label}InitList`]
+      // if (arr.length > 0) {
+      //   this.dataSourceList = arr
+      // } else {
+        this.$emit('getCompleteList', {
+          form: this.labelData,
+          value: value || ''
+        })
+      // }
     },
     inputChange (data) {
       this.changeInput(data)