更新安海

src/store/getters.js

@@ -15,6 +15,7 @@ const getters = {
   userInfo: state => state.user.info,
   userNotices: state => state.user.notices,
   isShowBook: state => state.user.isShowBook,
+  erpCodeEdit: state => state.user.erpCodeEdit,
   addRouters: state => state.permission.addRouters,
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,

src/store/modules/user.js

@@ -19,6 +19,7 @@ const user = {
     firstFlag: true, // 订舱台账首次加载
     desChinaFlag: false, // 货描是否可以输入中文
     feeShow: false, // 订舱详情是否显示费用
+    erpCodeEdit: true, // ERP 代码是否可以编辑 默认不可以
     slotShow: false, // 订舱详情是否显示舱位
     vesselFrom: false, // 船名下拉框采用哪种方式
     isShowBook: false, // 台账是否显示删除的
@@ -110,6 +111,9 @@ const user = {
     SET_VESSELFROM: (state, type) => {
       state.vesselFrom = type
     },
+    SET_ERPCODE: (state, type) => {
+      state.erpCodeEdit = type
+    },
     SET_BOOKINGGRIDOPTIONS: (state, obj) => {
       state.bookingGridOptions = obj
     },
@@ -230,6 +234,14 @@ const user = {
                   // 货描是否允许中文
                   if (item.paraCode === 'DESCRIP_CAN_CHINESE') {
                     commit('SET_DESCHINA', item.paraValue)
+                  }
+                   // EP代码是否可以编辑 默认不可以
+                   if (item.paraCode === 'ERP_CODE_CAN_EDIT') {
+                    if (item.paraValue === 'YES') {
+                      commit('SET_ERPCODE', false)
+                    } else {
+                      commit('SET_ERPCODE', true)
+                    }
                   }
                   // 台账是否显示删除
                   if (item.paraCode === 'BOOKING_LIST_SHOW_CANCEL') {

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

@@ -335,7 +335,7 @@
                   has-feedback
                   prop="vessel">
                   <div class="copy-box">
-                    <selectView
+                    <!-- <selectView
                       class="copy-input"
                       ref="vesselView"
                       type="vesselGangjie"
@@ -352,7 +352,22 @@
                       v-if="!vesselFrom"
                       :openSearch="true"
                       @change="getSelectViewRes">
-                    </selectView>
+                    </selectView> -->
+                    <autoView
+                      class="copy-input"
+                      type="vesselGangjie"
+                      :disabled="BookingLockOrder['vessel'] && isLockBooking"
+                      :defaultVal="details.vessel"
+                      searchApi="getVesselInfoService"
+                      :searchQuery="{
+                        KeyWord: '',
+                        PortDischargeId: this.details.portdischargeid || '',
+                        CarrierID: this.details.carrierid || 'CMA',
+                        ETD: this.details.etd || ''
+                      }"
+                      v-if="!vesselFrom"
+                      :showLabel="['vessel']"
+                      @selectInput="getAutoViewRes"></autoView>
                     <selectView
                       class="copy-input"
                       ref="vesselView"
@@ -572,7 +587,7 @@
                   has-feedback
                   prop="erpCode">
                   <inputView
-                    :ishd="isLockBooking"
+                    :ishd="erpCodeEdit"
                     type="erpCode"
                     :parentVal="details.erpCode"
                     @getInputChange="inputChange" />
@@ -996,7 +1011,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'projectDict', 'vesselFrom', 'subTenant'
+      'projectDict', 'vesselFrom', 'subTenant', 'erpCodeEdit'
     ])
   },
   methods: {
@@ -1336,9 +1351,13 @@ export default {
       }
     },
     getAutoViewRes({ type, res }) {
+      console.log(type, res)
       if (type === 'contractno') {
         this.details.contractno = res.contractNo || ''
       }
+       if (type === 'vesselGangjie') {
+        this.details.vessel = res || ''
+      }
     }
   }
 }

src/views/main/BookingLedger/detail/childModules/sendMail.vue

@@ -161,11 +161,13 @@ export default {
         }
       })
       PrintTuoshu({ bookingId: form.id }).then(res => {
-        this.fileList.push({
+        const arr = []
+        arr.push({
           name: res.data,
           path: res.data,
           type: 'print'
         })
+        this.fileList = arr
       })
     },
     handleDownFile(row) {
@@ -215,7 +217,6 @@ export default {
         arr.push(item.path)
       })
       data.fileList = arr
-      console.log(data)
       this.load = true
       SendTuoshu(data).then(res => {
         if (res.success) {

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

@@ -225,7 +225,7 @@ export default {
         return false
       }
       if (
-        !['vessel', 'lineName', 'notifypartycountryName', 'consigneecountryName', 'shippercountryName'].includes(
+        !['vessel', 'lineName', 'notifypartycountryName', 'consigneecountryName', 'shippercountryName','vesselGangjie'].includes(
           this.type
         ) &&
         this.bookingInitData[`${this.type}InitList`].length > 0

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

@@ -1351,6 +1351,7 @@ export default {
         if (arr.includes('ctnall')) {
           copyData.ctnInputs = res.data.ctnInputs
         }
+        this.isLockBooking = false
         newData = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData }
       }
       const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
@@ -1374,6 +1375,7 @@ export default {
           const secActive = this.$refs.sedOrder.$data.editIndex
           hisData.secActive = secActive
         }
+        this.isLockBooking = false
         this.$set(this.historyData, `copyMore-${this.id}`, hisData)
       }
       // this.getDefaultVal()

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

@@ -225,25 +225,8 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <template v-if="details.carrierid === 'ESL'">
-              <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
-                <a-form-model-item
-                  class="from-label"
-                  label="EP号"
-                  :labelCol="labelCol4"
-                  :wrapperCol="wrapperCol4"
-                  has-feedback
-                  prop="epCode">
-                  <inputView
-                    :ishd="BookingLockOrder['epCode'] && isLockBooking"
-                    type="epCode"
-                    :parentVal="details.epCode"
-                    @getInputChange="inputChange" />
-                </a-form-model-item>
-              </a-col>
-            </template>
             <template
-              v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL', 'MSCFD', 'REL', 'FCS', 'YML'].includes(details.carrierid)">
+              v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL', 'MSCFD', 'REL', 'FCS', 'YML','ESL','ESL-NEW'].includes(details.carrierid)">
               <a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
                 <a-form-model-item
                   class="from-label"
@@ -1167,10 +1150,6 @@ export default {
     },
     inputChange({ type, value }) {
       this.details[type] = value
-      // debugger
-      // if (type === 'voyno' && this.details.carrierid === 'ESL') {
-      //   this.details.voynoinner = this.details[type]
-      // }
       if (type === 'voynoinner' && this.details.voyno == '') {
         this.details.voyno = this.details[type]
       }
@@ -1182,8 +1161,8 @@ export default {
         this.details.voynoinner = ''
         this.details.vessel = ''
       }
-      if (type === 'epCode' && this.details.carrierid === 'ESL') {
-        this.details.tmblno = this.details[type]
+      if (this.details.carrierid === 'ESL' || this.details.carrierid === 'ESL-NEW') {
+        this.details.epCode = this.details[type]
       }
       this.$forceUpdate()
     },