临时提交

src/api/modular/main/BookingLedger.js

@@ -814,3 +814,27 @@ export function BookingSourcePage(parameter) {
     params: parameter
   })
 }
+
+export function getPageESeaeEdi(parameter) {
+  return axios({
+    url: '/BookingOrderSeaeEdi/PageESeaeEdi',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function CodeCountryList(parameter) {
+  return axios({
+    url: '/commondb/CodeCountryList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function seaeEdiSave(parameter) {
+  return axios({
+    url: '/BookingOrderSeaeEdi/Save',
+    method: 'post',
+    data: parameter
+  })
+}

src/layouts/BasicLayout.vue

@@ -132,7 +132,7 @@ export default {
     this.setBookingInfo()
   },
   methods: {
-    ...mapActions(['setSidebar', 'setCarrierList', 'setYardList', 'setPackageList', 'setIssuetypeList', 'setBlfrtList', 'setCtnallList', 'setLineList', 'setBookingSourcePage', 'setBookingInitData']),
+    ...mapActions(['setSidebar', 'setCarrierList', 'setYardList', 'setPackageList', 'setIssuetypeList', 'setBlfrtList', 'setCtnallList', 'setLineList', 'setBookingSourcePage', 'setBookingInitData', 'setCodeCountryList']),
     // 重新生成
     setMenus () {
       const routes = convertRoutes(this.mainMenu.find(item => item.path === '/'))
@@ -165,6 +165,7 @@ export default {
       this.setBlfrtList()
       this.setCtnallList()
       this.setLineList()
+      this.setCodeCountryList()
       this.setBookingSourcePage()
       this.setBookingInitData()
     }

src/store/getters.js

@@ -28,7 +28,8 @@ const getters = {
   ctnallList: state => state.booking.ctnallList,
   lineList: state => state.booking.lineList,
   bookingInitData: state => state.booking.bookingInitData,
-  sourceList: state => state.booking.sourceList
+  sourceList: state => state.booking.sourceList,
+  countryList: state => state.booking.countryList
 }
 
 export default getters

src/store/modules/booking.js

@@ -7,7 +7,8 @@ import {
   GetCtn,
   GetTenantLineList,
   GetAllSelectData,
-  BookingSourcePage
+  BookingSourcePage,
+  CodeCountryList
 } from '@/api/modular/main/BookingLedger'
 
 const booking = {
@@ -20,6 +21,7 @@ const booking = {
     ctnallList: [],
     lineList: [],
     sourceList: [],
+    countryList: [],
     bookingInitData: {
       customernameInitList: [],
       forwarderInitList: [],
@@ -79,6 +81,9 @@ const booking = {
     },
     SET_BOOKINGINITDATA: (state, obj) => {
       state.bookingInitData = { ...state.bookingInitData, ...obj }
+    },
+    SET_COUNTRYLIST: (state, list) => {
+      state.countryList = list
     }
   },
 
@@ -255,6 +260,26 @@ const booking = {
           })
       })
     },
+    setCodeCountryList({ commit }, obj) {
+      return new Promise(resolve => {
+        CodeCountryList({
+          SearchValue: ''
+        })
+          .then(response => {
+            if (response.success) {
+              commit('SET_COUNTRYLIST', response.data)
+              resolve(response.data)
+            } else {
+              // eslint-disable-next-line no-undef
+              reject(new Error(data.message))
+            }
+          })
+          .catch(error => {
+            // eslint-disable-next-line no-undef
+            reject(error)
+          })
+      })
+    },
     setBookingInitData({ commit }, obj) {
       return new Promise(resolve => {
         GetAllSelectData().then(response => {

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

@@ -2,7 +2,7 @@
   <div class="input-content">
     <input
       class="ant-input input-box"
-      :class="`input-${type}`"
+      :class="[`input-${type}`, {'disabled': ishd}]"
       size="small"
       :type="inputType"
       v-model="value"
@@ -41,13 +41,13 @@ export default {
   },
   data() {
     return {
-      value: this.parentVal !== 0 && !this.parentVal ? '' : this.parentVal
+      value: this.parentVal !== 0 && !this.parentVal ? '' : this.parentVal,
     }
   },
   watch: {
     parentVal(nval, oval) {
       this.value = nval
-    },
+    }
   },
   mounted() {
   },
@@ -86,6 +86,10 @@ export default {
     width: 100%;
     height: 24px;
     line-height: 24px;
+    background: #fff !important;
+    &.disabled{
+      background: #f5f5f5 !important;
+    }
   }
   .input-icon{
     position: absolute;
@@ -110,4 +114,5 @@ export default {
     }
   }
 }
+
 </style>

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

@@ -60,7 +60,8 @@ import {
  GetSysUserPage,
  GetService,
  getGoodsname,
- BookingSourcePage
+ BookingSourcePage,
+ CodeCountryList
 } from '@/api/modular/main/BookingLedger'
 import { mapGetters, mapActions } from 'vuex'
 let timer
@@ -113,7 +114,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData', 'sourceList'])
+    ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData', 'sourceList', 'countryList'])
   },
   watch: {
     defaultVal(nval, oval) {
@@ -339,6 +340,12 @@ export default {
           return arr
         case 'sourceName':
           return this.sourceList
+        case 'notifypartycountry':
+          return this.countryList
+        case 'consigneecountry':
+          return this.countryList
+        case 'shippercountry':
+          return this.countryList
       }
     },
     filterOption(input, option) {
@@ -391,7 +398,7 @@ export default {
         this.$refs.selectView.$refs.vcSelect.focus()
       }
       this.open = true
-      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod', 'sourceName'].includes(this.type)) {
+      if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod', 'sourceName', 'notifypartycountry', 'consigneecountry', 'shippercountry'].includes(this.type)) {
         this.selectList = this.emnuData(this.type)
         this.inLoading = false
         return false
@@ -405,7 +412,7 @@ export default {
       }
       if (!e) {
         console.log('首次搜索内容', e, this.type, this.bookingInitData)
-        if (!['vessel', 'lineName'].includes(this.type) && this.bookingInitData[`${this.type}InitList`].length > 0) {
+        if (!['vessel', 'lineName', 'notifypartycountry', 'consigneecountry', 'shippercountry'].includes(this.type) && this.bookingInitData[`${this.type}InitList`].length > 0) {
           console.log(this.bookingInitData[`${this.type}InitList`])
           this.selectList = this.bookingInitData[`${this.type}InitList`]
           return false

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

@@ -238,7 +238,6 @@
                   prop="tempset"
                 >
                   <inputView type="tempset" size="small" :parentVal="details.tempset" @getInputChange="inputChange"/>
-
                 </a-form-model-item>
               </a-col>
               <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">

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

@@ -36,6 +36,9 @@
         <button @click="openModel('trace')">
           <span class="iconfont icon-yunshu1" style="font-size:18px;"></span>运踪订阅
         </button>
+        <button @click="openPreOrderFun">
+          <span class="iconfont icon-yunshu1" style="font-size:18px;"></span>预配舱单
+        </button>
       </div>
       <div class="btn-list more-view-2">
         <button @click="openModel('initCabin')">
@@ -167,7 +170,7 @@
             </a-button> -->
           </template>
         </div>
-        <a-form>
+        <a-form class="initCabin-box">
           <a-row :gutter="16">
             <div class="item-box to-box" :style="{ paddingTop: '0px' }">
               <!-- to -->
@@ -708,6 +711,15 @@
       </template>
     </a-modal>
     <!-- 运踪弹窗 end -->
+
+    <!-- 预配舱单列表 start -->
+    <!-- <a-modal width="90vw" :maskClosable="false" v-model="openPreOrderShow" title="预配舱单"> -->
+    <pre-order ref="preOrder" :details="details"/>
+    <!-- <template slot="footer">
+        <a-button type="primary" @click="closeOpenPreOrder">取消</a-button>
+      </template> -->
+    <!-- </a-modal> -->
+    <!-- 预配舱单列表 end -->
   </div>
 </template>
 <script>
@@ -717,7 +729,6 @@ import {
   VgmSend,
   LetterYard,
   SampleBill,
-  VgmLink,
   SendLetterYard,
   SaveBookingLetteryard,
   SaveBookingSampleBill,
@@ -725,19 +736,17 @@ import {
   TxxpLink,
   ExcuteRulesOceanBooking,
   BookingOrderPrintOrder,
-  BookingOrderDownloadPrint,
-  BookingOrderViewPrintPdf,
   BookingOrderOcrUpFile,
   BookingOrderOcrGetImg,
   BookingOrderOcrGetText,
   BookingOrderPrintTemplateWithHistoryList,
   DownloadBookingOrClosingEDI,
   DeleteLetterYard,
-  LetterYardPdf,
   SendTrace,
   GetYardlist
 } from '@/api/modular/main/BookingLedger'
 
+import preOrder from './preOrder'
 export default {
   props: {
     details: {
@@ -751,6 +760,9 @@ export default {
       default: false
     }
   },
+  components: {
+    preOrder
+  },
   data() {
     return {
       id: this.$route.query.id,
@@ -839,6 +851,7 @@ export default {
       cateCode: '',
       spinning: false,
       yardSelectData: null
+      // openPreOrderShow: false
     }
   },
   mounted() {
@@ -1618,6 +1631,16 @@ export default {
     },
     cancelRemove () {
       console.log('== 取消删除 ==')
+    },
+    openPreOrderFun () {
+      if (!this.id) {
+        this.$message.error('请先保存主单')
+        return false
+      }
+      this.$refs.preOrder.init()
+    },
+    closeOpenPreOrder () {
+      this.$refs.preOrder.close()
     }
   }
 }

src/views/main/BookingLedger/detail/rules.js

@@ -142,5 +142,14 @@ export default {
 		tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
 		weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
 		weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' }
+	},
+	preRules: {
+		ctn: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
+        cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
+        sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
+        pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
+        kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
+        kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
+        cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' }
 	}
 }

src/views/main/BookingLedger/detail/style/operationArea.less

@@ -80,7 +80,7 @@
       }
     }
     .more-view-1 {
-      width: 270px;
+      width: 332px;
       .iconfont {
         color: #26b578;
       }
@@ -279,43 +279,7 @@
       }
     }
   }
-  
-  // .box-flex{
-  //   /deep/ .ant-modal-body .ant-input-affix-wrapper {
-  //     height: 100px;
-  //     position: relative;
-  //     z-index: 1;
-  //     background: #f99;
-  //     &::after {
-  //       content: '';
-  //       position: absolute;
-  //       top: 0;
-  //       left: 0;
-  //       width: 100%;
-  //       height: 72px !important;
-  //       z-index: -1;
-  //       display: block;
-  //       background-color: @primary-color !important;
-  //       opacity: 0.04;
-  //     }
-  //   }
-  // }
-  // /deep/ .ant-input{
-  //   position: relative;
-  //   z-index: 1;
-  //   &::after {
-  //     content: '';
-  //     position: absolute;
-  //     top: 0;
-  //     left: 0;
-  //     width: 100%;
-  //     height: 100%;
-  //     z-index: -1;
-  //     display: block;
-  //     background-color: @primary-color !important;
-  //     opacity: 0.04;
-  //   }
-  // }
+  .initCabin-box{
     /deep/ .ant-select-selection {
       position: relative;
       z-index: 1;
@@ -331,6 +295,8 @@
         opacity: 0.04;
       }
     }
+  }
+ 
   /deep/ .ant-calendar-picker {
     position: relative;
     z-index: 1;