diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 12e7b22..82779cc 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -805,3 +805,12 @@ export function ExcuteShippingOrderCompareBatch(parameter) { data: parameter }) } + +// 分页查询订舱业务来源 +export function BookingSourcePage(parameter) { + return axios({ + url: '/BookingSource/page', + method: 'get', + params: parameter + }) +} diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 89c69fd..014df67 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', 'setBookingInitData']), + ...mapActions(['setSidebar', 'setCarrierList', 'setYardList', 'setPackageList', 'setIssuetypeList', 'setBlfrtList', 'setCtnallList', 'setLineList', 'setBookingSourcePage', 'setBookingInitData']), // 重新生成 setMenus () { const routes = convertRoutes(this.mainMenu.find(item => item.path === '/')) @@ -165,6 +165,7 @@ export default { this.setBlfrtList() this.setCtnallList() this.setLineList() + this.setBookingSourcePage() this.setBookingInitData() } } diff --git a/src/store/getters.js b/src/store/getters.js index 20626e6..27c2ec7 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -27,7 +27,8 @@ const getters = { blfrtList: state => state.booking.blfrtList, ctnallList: state => state.booking.ctnallList, lineList: state => state.booking.lineList, - bookingInitData: state => state.booking.bookingInitData + bookingInitData: state => state.booking.bookingInitData, + sourceList: state => state.booking.sourceList } export default getters diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js index d83bb0b..1ac644d 100644 --- a/src/store/modules/booking.js +++ b/src/store/modules/booking.js @@ -6,7 +6,8 @@ import { GetFrt, GetCtn, GetTenantLineList, - GetAllSelectData + GetAllSelectData, + BookingSourcePage } from '@/api/modular/main/BookingLedger' const booking = { @@ -18,6 +19,7 @@ const booking = { blfrtList: [], ctnallList: [], lineList: [], + sourceList: [], bookingInitData: { customernameInitList: [], forwarderInitList: [], @@ -72,6 +74,9 @@ const booking = { SET_LINELIST: (state, list) => { state.lineList = list }, + SET_SOURCELIST: (state, list) => { + state.sourceList = list + }, SET_BOOKINGINITDATA: (state, obj) => { state.bookingInitData = { ...state.bookingInitData, ...obj } } @@ -230,6 +235,26 @@ const booking = { }) }) }, + setBookingSourcePage({ commit }, obj) { + return new Promise(resolve => { + BookingSourcePage({ + SearchValue: '' + }) + .then(response => { + if (response.success) { + commit('SET_SOURCELIST', response.data.rows) + 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/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index fdb5455..0c8f6ba 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/src/views/main/BookingLedger/detail/components/selectView.vue @@ -59,7 +59,8 @@ import { GetForwarderlist, GetSysUserPage, GetService, - getGoodsname + getGoodsname, + BookingSourcePage } from '@/api/modular/main/BookingLedger' import { mapGetters, mapActions } from 'vuex' let timer @@ -112,7 +113,7 @@ export default { } }, computed: { - ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData']) + ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData', 'sourceList']) }, watch: { defaultVal(nval, oval) { @@ -193,6 +194,8 @@ export default { return GetService case 'getGoodsname': return getGoodsname + case 'BookingSourcePage': + return BookingSourcePage } }, emnuData (type) { @@ -334,6 +337,8 @@ export default { case 'shippingMethod': const arr = this.$options.filters['dictData']('ShippingMethod') || [] return arr + case 'sourceName': + return this.sourceList } }, filterOption(input, option) { @@ -386,7 +391,7 @@ export default { this.$refs.selectView.$refs.vcSelect.focus() } this.open = true - if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod'].includes(this.type)) { + if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'masterBolIndicator', 'salerCode', 'shippingMethod', 'sourceName'].includes(this.type)) { this.selectList = this.emnuData(this.type) this.inLoading = false return false diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 3ec749a..fe85c43 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -251,15 +251,15 @@ const initDetail = { issuedate: '', issueplace: '', issueplaceid: '', - nobill: 'THREE', - copynobill: 'THREE', + nobill: '', + copynobill: '', prepardat: '', prepardatid: '', payableat: '', payableatid: '', blfrt: '', thirdpayaddr: '', - service: 'CY-CY', + service: '', reeferf: '', tempset: '', tempid: '', @@ -1052,7 +1052,7 @@ export default { } const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt } this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } }) - this.getDefaultVal() + // this.getDefaultVal() this.inPageLoading = false setTimeout(() => { setTimeout(() => { diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index aaed9af..558b00b 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -206,7 +206,7 @@
- + - + + + + +
+ + + + 是 + + + 否 + + +
+
+