修改问题

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

@@ -460,10 +460,10 @@ export default {
     )
   },
   beforeRouteUpdate(to, from, next) {
-    // if (this.inAddSave) {
-    //   next()
-    //   return false
-    // }
+    if (this.inAddSave) {
+      next()
+      return false
+    }
     if (this.isCopy) {
       const hisData = {
         bookingDetails: this.bookingDetails,
@@ -1047,8 +1047,19 @@ export default {
           return ''
       }
     },
-    changeAtd(time) {
-      this.bookingDetails.atd = time + ':00'
+    changeAtd(time, type) {
+      if (type === 1) {
+        this.bookingDetails.startETA = time + ':00'
+      }
+      if (type === 2) {
+        this.bookingDetails.startATA = time + ':00'
+      }
+      if (type === 3) {
+        this.bookingDetails.ygtETD = time + ':00'
+      }
+      if (type === 4) {
+        this.bookingDetails.atd = time + ':00'
+      }
     },
     getDetail() {
       if (this.inPageLoading) {

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

@@ -60,9 +60,11 @@
               </span>
               <div>
                 <p>
+                  <a-icon type="edit" @click="handleOpenAtd(1)" />
                   <span>ETA:</span><span>{{ handleTime(details.startETA) }}</span>
                 </p>
                 <p>
+                  <a-icon type="edit" @click="handleOpenAtd(2)" />
                   <span>ATA:</span><span>{{ handleTime(details.startATA) }}</span>
                 </p>
               </div>
@@ -71,9 +73,11 @@
               <span> </span>
               <div>
                 <p>
+                  <a-icon type="edit" @click="handleOpenAtd(3)" />
                   <span>ETD:</span><span>{{ handleTime(details.ygtETD) }}</span>
                 </p>
-                <p @click="handleOpenAtd" style="cursor: pointer;">
+                <p style="cursor: pointer;">
+                  <a-icon type="edit" @click="handleOpenAtd(4)" />
                   <span>ATD:</span><span>{{ handleTime(details.atd) }}</span>
                 </p>
               </div>
@@ -378,7 +382,7 @@
       </a-spin>>
     </a-modal>
     <a-modal
-      title="实际开船日期"
+      :title="Cqtitle"
       :width="600"
       :visible="atdFlag"
       :maskClosable="false"
@@ -395,7 +399,7 @@
           cancel-text="取消"
           @confirm="handleSubimtAtd"
         >
-          <a-button type="primary" >确定</a-button>
+          <a-button type="primary" style="color: white;" >确定</a-button>
         </a-popconfirm>
       </template>
     </a-modal>
@@ -462,9 +466,11 @@ export default {
       fileModelconfirm: false,
       authorization: 'authorization-text',
       file: {},
+      Cqtitle: '',
       upFileList: [],
       uploading: false,
       realTimePercent: null,
+      CqType: 0,
       bookingServiceItem: [],
       atdLoading: false,
       booGoodsStatusItem: [],
@@ -547,20 +553,47 @@ export default {
     handleCancel() {
       this.roleFlag = false
     },
-    handleOpenAtd() {
+    handleOpenAtd(type) {
       this.atdFlag = true
-      this.atdTime = JSON.parse(JSON.stringify(this.details)).atd
+      this.CqType = type
+      if (type === 1) {
+        this.Cqtitle = 'ETA'
+        this.atdTime = JSON.parse(JSON.stringify(this.details)).startETA
+      }
+      if (type === 2) {
+        this.Cqtitle = 'ATA'
+        this.atdTime = JSON.parse(JSON.stringify(this.details)).startATA
+      }
+      if (type === 3) {
+        this.Cqtitle = 'ETD'
+        this.atdTime = JSON.parse(JSON.stringify(this.details)).ygtETD
+      }
+      if (type === 4) {
+        this.Cqtitle = 'ATD'
+        this.atdTime = JSON.parse(JSON.stringify(this.details)).atd
+      }
     },
     handleSubimtAtd() {
       const data = {
-        atd: this.atdTime,
         Id: this.details.id
       }
+      if (this.CqType === 1) {
+        data.startETA = this.atdTime
+      }
+      if (this.CqType === 2) {
+        data.startATA = this.atdTime
+      }
+      if (this.CqType === 3) {
+        data.ygtETD = this.atdTime
+      }
+      if (this.CqType === 4) {
+        data.atd = this.atdTime
+      }
       this.atdLoading = true
       SaveDataInList(data).then(res => {
         if (res.success) {
           this.$message.success('修改成功')
-          this.$emit('changeAtd', this.atdTime)
+          this.$emit('changeAtd', this.atdTime, this.CqType)
           this.$store.commit('SET_SAVENEEDNUMBER', this.details.id)
           this.atdFlag = false
         } else {

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

@@ -832,7 +832,7 @@ import importBcMore from './modules/importBcMore'
 import {
   PageDataByBooking,
   SendTrace,
-  GetVessellist,
+  getVesselInfoService,
   GetPortlist,
   GetPortloadlist,
   BookingOrderBachUpdate,
@@ -1297,7 +1297,7 @@ export default {
         this.WebVessel = data
       }
 
-      GetVessellist({ KeyWord: data }).then((res) => {
+      getVesselInfoService({ KeyWord: data }).then((res) => {
         this.vesselData = res.data
       })
     },
@@ -2486,7 +2486,7 @@ export default {
     emnuCompleteApi(type) {
       switch (type) {
         case 'VESSEL':
-          return GetVessellist
+          return getVesselInfoService
         case 'CUSTOMERNAME':
           return DjyCustomerSuggest
         case 'FORWARDER':

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

@@ -398,7 +398,8 @@ export default {
       })
     },
     completeChange(value) {
-      const val = value ? value.split('-_-')[1] : ''
+      if (value !== '' && value !== undefined && value !== null) {
+        const val = value ? value.split('-_-')[1] : ''
         this.$emit('change', {
           form: this.labelData,
           value: val || value || ''
@@ -407,6 +408,16 @@ export default {
           form: this.labelData,
           value: value.includes('-_-') ? val || '' : value || ''
         })
+      } else {
+        this.$emit('change', {
+          form: this.labelData,
+          value: ''
+        })
+        this.$emit('getCompleteList', {
+          form: this.labelData,
+          value: ''
+        })
+      }
     },
     completeChangeFirst(value) {
       if (this.value) {

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

@@ -520,7 +520,7 @@ export default {
       showLabel2: 'name'
     }, // 场站显示 name , yardid 取字段 code
     // { title: '船名/航次', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'vessel', showLabel2: 'voyno' }, // 船名航次换接口 船名 vessel 航次 voyno
-    { title: '船名', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'name' }, // 船名航次换接口 船名 vessel 航次 voyno
+    { title: '船名', align: 'center', width: 120, label: 'VESSEL', type: 'complete', showLabel: 'vessel' }, // 船名航次换接口 船名 vessel 航次 voyno
     { title: '开船日期', align: 'center', width: 160, label: 'ETD', type: 'dateRange', resLabel: ['BETD', 'EETD'] },
     { title: '实际开船日期', align: 'center', width: 160, label: 'ATD', type: 'dateRange', resLabel: ['BATD', 'EATD'] },
     { title: '预计到港日期', align: 'center', width: 160, label: 'ETA', type: 'dateRange', resLabel: ['BETA', 'EETA'] },

src/views/main/CommondbCarrierList/addForm.vue

@@ -39,14 +39,14 @@
               <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="12">
+          <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />

src/views/main/CommondbCarrierList/editForm.vue

@@ -40,14 +40,14 @@
               <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="12">
+          <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />