diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 82779cc..f270a50 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/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 + }) +} diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 014df67..6651e12 100644 --- a/src/layouts/BasicLayout.vue +++ b/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() } diff --git a/src/store/getters.js b/src/store/getters.js index 27c2ec7..898318a 100644 --- a/src/store/getters.js +++ b/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 diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js index 1ac644d..3834ed6 100644 --- a/src/store/modules/booking.js +++ b/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 => { diff --git a/src/views/main/BookingLedger/detail/components/inputView.vue b/src/views/main/BookingLedger/detail/components/inputView.vue index 1fb443f..96cb8aa 100644 --- a/src/views/main/BookingLedger/detail/components/inputView.vue +++ b/src/views/main/BookingLedger/detail/components/inputView.vue @@ -2,7 +2,7 @@
diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index 0c8f6ba..2bb8425 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/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 diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index 75d4b10..e9e83ca 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -238,7 +238,6 @@ prop="tempset" > - diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 2e3efc0..c1beada 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -36,6 +36,9 @@ +
- +
@@ -708,6 +711,15 @@ + + + + + + +
+ + diff --git a/src/views/main/BookingLedger/detail/rules.js b/src/views/main/BookingLedger/detail/rules.js index e47d643..32c2275 100644 --- a/src/views/main/BookingLedger/detail/rules.js +++ b/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' } } } diff --git a/src/views/main/BookingLedger/detail/style/operationArea.less b/src/views/main/BookingLedger/detail/style/operationArea.less index c4a2ced..0e7278f 100644 --- a/src/views/main/BookingLedger/detail/style/operationArea.less +++ b/src/views/main/BookingLedger/detail/style/operationArea.less @@ -80,7 +80,7 @@ } } .more-view-1 { - width: 270px; + width: 332px; .iconfont { color: #26b578; } @@ -279,58 +279,24 @@ } } } - - // .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; - // } - // } - /deep/ .ant-select-selection { - position: relative; - z-index: 1; - &::after { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: -1; - background-color: @primary-color !important; - opacity: 0.04; + .initCabin-box{ + /deep/ .ant-select-selection { + position: relative; + z-index: 1; + &::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; + background-color: @primary-color !important; + opacity: 0.04; + } } } + /deep/ .ant-calendar-picker { position: relative; z-index: 1;