修改列表样式， 船名带出etd, 太平edi等

src/api/modular/main/BookingLedger.js

@@ -638,3 +638,12 @@ export function BookingOrderBachUpdate(parameter) {
     data: parameter
   })
 }
+
+// 根据船名航次，获取海关航次等信息
+export function getVesselInfoService(parameter) {
+  return axios({
+    url: '/DjyVesselInfoService/GetList',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/detail/components/ediMore.vue

@@ -2,6 +2,7 @@
   <div class="more-edi" :style="{paddingTop:'25px'}">
     <a-form-model ref="ediFrom" :model="details" :rules="rules">
       <a-row :gutter="16">
+        <div class="normal">
           <a-col :span="8">
             <a-form-model-item
               label="发送方EDI代码"
@@ -270,6 +271,101 @@
               <a-textarea v-model="details.bookingEDIExt.weiTuoFang" />
             </a-form-model-item>
           </a-col>
+        </div>
+        <!-- === 太平添加 start === -->
+        <div class="taiping" v-if="false">
+          <a-col :span="12">
+            <a-form-model-item
+              label="订舱人说明"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.orderRemark"
+            >
+              <a-input v-model="details.bookingEDIExt.orderRemark" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item
+              label="通知人EDI代码"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.notifyCdoe"
+            >
+              <a-input v-model="details.bookingEDIExt.notifyCdoe" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item
+              label="太平销售EDI代码"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.salerCodeName"
+            >
+              <a-select default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.salerCodeName">
+                <a-select-option v-for="(sales, sindex) in StoreSalesRepCode" :value="sales.NAME" :key="sindex">
+                  {{ sales.NAME }}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+  
+          <a-col :span="12">
+            <a-form-model-item
+              label="Master Bol Indicator名称"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.masterBolIndicatorName"
+            >
+              <a-select default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.masterBolIndicatorName">
+                <a-select-option v-for="(master, mindex) in StoreMasterBOLIndicator" :value="master.NAME" :key="mindex">
+                  {{ master.NAME }}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+  
+          <a-col :span="12">
+            <a-form-model-item
+              label="欧盟港口、伊朗港口、KHI"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.ckhi"
+            >
+              <a-input v-model="details.bookingEDIExt.ckhi" />
+            </a-form-model-item>
+          </a-col>
+  
+          <a-col :span="12">
+            <a-form-model-item
+              label="南美东"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.cncm"
+            >
+              <a-input v-model="details.bookingEDIExt.cncm" />
+            </a-form-model-item>
+          </a-col>
+  
+          <a-col :span="12">
+            <a-form-model-item
+              label="巴西线木质包装情况"
+              :labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
+              :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+              has-feedback
+              prop="bookingEDIExt.wncm"
+            >
+              <a-input v-model="details.bookingEDIExt.wncm" />
+            </a-form-model-item>
+          </a-col>
+        </div>
+
+        <!-- === 太平添加 END === -->
       </a-row>
     </a-form-model>
   </div>
@@ -292,7 +388,24 @@ export default {
   },
   data() {
     return {
-      iscontainersoc: ''
+      iscontainersoc: '',
+      // 销售EDI代码
+      StoreSalesRepCode: [
+        { ID: 'CN087', NAME: 'CN087 | GRACE SUN' },
+        { ID: 'CN096', NAME: 'CN096 | LEON LIANG' },
+        { ID: 'CN097', NAME: 'CN097 | CHARLES GAO' },
+        { ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' },
+        { ID: 'CN106', NAME: 'CN106 | HOKI YU' },
+        { ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' },
+        { ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' },
+        { ID: 'CN100', NAME: 'CN100 | LEOREN' }
+      ],
+      // Master BOL Indicator
+      StoreMasterBOLIndicator: [
+        { ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' },
+        { ID: '2', NAME: 'Self filing HBL | 自己发' },
+        { ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' }
+      ]
     }
   },
   watch: {
@@ -360,4 +473,14 @@ export default {
     margin-left: 20px;
   }
 }
+.normal{
+  margin-bottom: 10px;
+  overflow: hidden;
+}
+.taiping{
+  border-top: 1px dashed #ddd;
+  margin-top: 10px;
+  padding-top: 10px;
+  overflow: hidden;
+}
 </style>

src/views/main/BookingLedger/detail/components/sedOrder.vue

@@ -470,7 +470,7 @@ export default {
         remarksFrom = valid
       })
       if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
-        this.$message.error('请填写完整数据')
+        this.$message.error('保存失败，请检查必填项')
         return false
       }
       if (this.$refs.ediMore) {
@@ -480,7 +480,7 @@ export default {
         })
         if (!ediFrom) {
           this.mainOrderActiveKey = '2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       } else {
@@ -493,7 +493,7 @@ export default {
         })
         if (this.hasEdiRules) {
           this.mainOrderActiveKey = '2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       }
@@ -509,7 +509,7 @@ export default {
           })
         })
         if (tableErrTip !== '') {
-          this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
+          this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
           return false
         }
       }
@@ -561,7 +561,7 @@ export default {
         remarksFrom = valid
       })
       if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
-        this.$message.error('请填写完整数据')
+        this.$message.error('保存失败，请检查必填项')
         return false
       }
       if (this.$refs.ediMore) {
@@ -571,7 +571,7 @@ export default {
         })
         if (!ediFrom) {
           this.mainOrderActiveKey = '2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       } else {
@@ -584,7 +584,7 @@ export default {
         })
         if (this.hasEdiRules) {
           this.mainOrderActiveKey = '2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       }
@@ -600,7 +600,7 @@ export default {
           })
         })
         if (tableErrTip !== '') {
-          this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
+          this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
           return false
         }
       }

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

@@ -123,8 +123,8 @@ const initDetail = {
   // 基本信息
   customername: '',
   customerid: '',
-  carrier: '',
+  carrier: 'CMA',
-  carrierid: '',
+  carrierid: 'CMA',
   forwarder: '',
   pono: '',
   mblno: '',
@@ -238,7 +238,7 @@ export default {
   },
   data() {
     return {
-      type: this.$route.query.type,
+      type: this.$route.query.type || 'CMA',
       id: this.$route.query.id,
       isCopy: this.$route.query.isCopy || false,
       inPageLoading: false,
@@ -855,7 +855,7 @@ export default {
         remarksFrom = valid
       })
       if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
-        this.$message.error('请填写完整数据')
+        this.$message.error('保存失败，请检查必填项')
         return false
       }
       if (this.$refs.ediMore) {
@@ -865,7 +865,7 @@ export default {
         })
         if (!ediFrom) {
           this.mainOrderActiveKey = '2-2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       } else {
@@ -878,7 +878,7 @@ export default {
         })
         if (this.hasEdiRules) {
           this.mainOrderActiveKey = '2-2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       }
@@ -895,7 +895,7 @@ export default {
           })
         })
         if (tableErrTip !== '') {
-          this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
+          this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
           return false
         }
       }
@@ -965,7 +965,7 @@ export default {
         remarksFrom = valid
       })
       if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
-        this.$message.error('请填写完整数据')
+        this.$message.error('保存失败，请检查必填项')
         return false
       }
       if (this.$refs.ediMore) {
@@ -975,7 +975,7 @@ export default {
         })
         if (!ediFrom) {
           this.mainOrderActiveKey = '2-2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       } else {
@@ -988,7 +988,7 @@ export default {
         })
         if (this.hasEdiRules) {
           this.mainOrderActiveKey = '2-2'
-          this.$message.error('请填写完整EDI数据')
+          this.$message.error('保存失败，请检查EDI必填项')
           return false
         }
       }
@@ -1004,7 +1004,7 @@ export default {
           })
         })
         if (tableErrTip !== '') {
-          this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
+          this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
           return false
         }
       }

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

@@ -173,13 +173,23 @@
                     :allowClear="true"
                     class="customer-input"
                     v-model="details.vessel"
-                    :data-source="vesselDataArr"
                     :dropdown-match-select-width="false"
                     :dropdown-style="{ width: '200px' }"
+                    option-label-prop="value"
                     @select="vesselSelect"
                     @change="vesselChange"
                     @focus="vesselChange"
-                  />
+                  >
+                    <template slot="dataSource">
+                      <a-select-option v-for="(vessel, index) in vesselData" :key="index" :value="index + ''">
+                        <div class="vessel-label">
+                          <div class="title"> {{ vessel.vessel }} </div>
+                          <div class="voyno">航次： <span>{{ vessel.voyno || '--' }}</span></div>
+                          <div class="etd">etd： <span>{{ vessel.etd || '--' }}</span></div>
+                        </div>
+                      </a-select-option>
+                    </template>
+                  </auto-complete>
                 </a-form-model-item>
               </a-col>
               <template v-if="details.carrierid === 'ESL'">
@@ -538,7 +548,8 @@ import {
   GetForwarderlist,
   DjyCustomerdetail,
   BookingOrderContactSavebatch,
-  BookingOrderContactPage
+  BookingOrderContactPage,
+  getVesselInfoService
 } from '@/api/modular/main/BookingLedger'
 
 export default {
@@ -747,22 +758,6 @@ export default {
         return []
       }
     },
-    vesselDataArr() {
-      if (this.vesselData) {
-        const arr = []
-        this.vesselData.map((item, index) => {
-          // if (!arr.includes(item.fullName)) {
-          //   arr.push(item.fullName)
-          // }
-          if (!arr.includes(item.name)) {
-            arr.push(item.name)
-          }
-        })
-        return arr
-      } else {
-        return []
-      }
-    },
     voynoinnerDataArr() {
       if (this.voynoinnerData) {
         const arr = []
@@ -1136,7 +1131,12 @@ export default {
 
     // 船名 - start
     getVessel(name = '') {
-      GetVessellist({
+      if (!this.details.carrierid) {
+        this.details.carrierid = 'CMA'
+        this.details.carrier = 'CMA'
+      }
+      getVesselInfoService({
+        CarrierID: this.details.carrierid,
         KeyWord: name
       })
       .then(res => {
@@ -1150,9 +1150,12 @@ export default {
       })
     },
     vesselSelect(value) {
-      this.details.vessel = value
+      const index = Number(value)
-      const index = this.vesselDataArr.indexOf(value)
+      this.details.vessel = this.vesselData[index].vessel
-      this.details.vesselid = this.vesselData[index].code
+      this.details.atd = this.vesselData[index].atd
+      this.details.etd = this.vesselData[index].etd
+      this.details.voyno = this.vesselData[index].voyno
+      this.details.voynoinner = this.vesselData[index].voynoInside
     },
     vesselChange(value) {
       if (!value) {
@@ -1463,7 +1466,24 @@ export default {
 .ant-input[type="text"]{
   height: 28px !important;
 }
-
+.vessel-label{
+  // border-bottom:1px solid #eee;
+  .title{
+    height: 28px;
+    line-height: 28px;
+    font-size: 14px;
+    font-weight:600;
+    color: #666;
+    border-bottom:1px dashed #ddd;
+    margin-bottom: 4px;
+  }
+  .voyno, .etd {
+    height: 22px;
+    line-height: 22px;
+    font-size: 12px;
+    color: #999;
+  }
+}
 
 // .ant-calendar-picker-input{
 //   padding: 0 4px;

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-row :gutter="24">
-      <a-col :md="24" :sm="24" style="padding: 0 0 0 0">
+      <a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
         <!-- <div class="nav-box">
           <div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
           <div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
@@ -11,7 +11,7 @@
           <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
           <div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>小票状态</div>
         </div> -->
-        <x-card>
+        <x-card class="content-nav">
           <div slot="content" class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48" class="booking-from-box">
@@ -106,6 +106,7 @@
               ref="xGrid"
               v-bind="gridOptions"
               row-class-name="line-box"
+              :height="tableHeight"
               @page-change="handlePageChange"
               @cell-dblclick="handledbclick"
               @resizable-change="resizableChange"
@@ -525,7 +526,7 @@ export default {
       formMoreTableData: null,
       // 新增弹窗
       addVisible: false,
-      carrierRadio: '',
+      carrierRadio: 'CMA',
       radioStyle: {
         display: 'block',
         height: '50px',
@@ -551,6 +552,7 @@ export default {
       ],
       traceValue: [],
       addNum: 0,
+      tableHeight: 0,
       // 批量编辑
       editingForm: this.$form.createForm(this),
       vesselData: [],
@@ -563,6 +565,8 @@ export default {
     this.showColumns = JSON.parse(JSON.stringify(initData.columns))
     this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
     this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData))
+    this.tableHeight = document.body.clientHeight - 300
+    console.log('table-height', this.tableHeight)
     this.getFormData()
     this.getTableList()
     this.getPageSize()