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

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

@@ -898,10 +898,13 @@ export default {
       console.log(value)
       // this.getCarrier(value)
     },
-    handleCarrierChange(index) {
+    handleCarrierChange(data) {
-      this.details.carrier = this.carrierSelectData[index].cnName
+      this.carrierSelectData.forEach(item => {
-      this.details.carrierid = this.carrierSelectData[index].code
+        if (item.code == data) {
-      console.log(this.details.carrier, this.details.carrierid)
+          console.log(item)
+          this.details.carrier = item.cnName
+        }
+      })
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0

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

@@ -414,6 +414,19 @@
     <a-modal width="50vw" v-model="PrintModalVisible" title="打印">
       <template slot="footer"> <span></span> </template>
       <div class="PrintMain">
+        <div class="PrintRadio">
+          <a-radio-group default-value="1" button-style="solid" v-model="PrintType">
+            <a-radio-button value="1">
+              pdf
+            </a-radio-button>
+            <a-radio-button value="2">
+              xlsx
+            </a-radio-button>
+            <a-radio-button value="3">
+              docx
+            </a-radio-button>
+          </a-radio-group>
+        </div>
         <span v-for="item in templateType" :key="item.id" @click="FnCilckTemplateType(item.code)" class="items">
           {{ item.name }}
         </span>
@@ -578,7 +591,8 @@ export default {
       ],
       BCvData: [],
       Rdata: '',
-      scale: '1.5'
+      scale: '1.5',
+      PrintType: '1'
     }
   },
   mounted() {
@@ -689,7 +703,7 @@ export default {
     },
     FnCilckTemplateType(typeCode) {
       this.$message.success(`搜索文件中...`)
-      BookingOrderPrint({ typeCode, bookingId: this.id })
+      BookingOrderPrint({ typeCode, bookingId: this.id, type: this.PrintType })
         .then(res => {
           console.log(res)
           if (!res.success) {
@@ -1316,4 +1330,9 @@ export default {
 /deep/ .ant-modal-body .ant-input {
   background: #f5f9fe;
 }
+.PrintRadio {
+  width: 100%;
+  padding-left: 1rem;
+  margin-bottom: 0.8rem;
+}
 </style>

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

@@ -121,7 +121,7 @@
             </template>
           </a-tree-node>
         </a-directory-tree> -->
-        <div class="no-data" v-if="fileList.length === 0">
+        <div class="no-data" v-if="bookingLogList.length === 0">
           <i class="iconfont icon-queshengye_zanwushuju" :style="{ fontSize: '50px' }"></i>
           <div class="text">暂无动态</div>
         </div>

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

@@ -810,6 +810,7 @@ export default {
   // background: #f5f9fe;
   position: relative;
   background: #fff;
+  z-index: 1;
   &::after{
     content: '';
     position: absolute;
@@ -819,6 +820,7 @@ export default {
     z-index: 0;
     background: @primary-color;
     opacity: .04;
+    z-index: -1;
   }
 }
 /*列表操作按钮颜色 */

src/views/main/BookingLedger/list/modules/initData.js

@@ -3,7 +3,7 @@ export default {
     { type: 'checkbox', width: 60, noDraggable: true },
     { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true },
     { field: 'yard', title: '场站', showHeaderOverflow: true, sortable: true },
-    { title: '提单号', showHeaderOverflow: true, sortable: true, slots: { default: 'mblno' } },
+    { title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } },
     { title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } },
     { field: 'etd', title: '开船日期', showHeaderOverflow: true, sortable: true },
     { field: 'voyno', title: '海关航次', showHeaderOverflow: true },