diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 2cbdb9e..e1ea606 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -1082,3 +1082,50 @@ export function yardLetterYardHis (parameter) { params: parameter }) } +export function GetSeryiceProjectList (parameter) { + return axios({ + url: '/BookingValueAdded/GetServiceProjectList', + method: 'post', + data: parameter + }) +} + +export function SaveServiceProject (parameter) { + return axios({ + url: '/BookingValueAdded/SaveServiceProject', + method: 'post', + data: parameter + }) +} + +export function CancelSeryiceProject (parameter) { + return axios({ + url: '/BookingValueAdded/CancelServiceProject', + method: 'post', + data: parameter + }) +} + +export function GetServiceStatusList (parameter) { + return axios({ + url: '/BookingValueAdded/GetServiceStatusList', + method: 'post', + data: parameter + }) +} + +export function SaveServiceStatus (parameter) { + return axios({ + url: '/BookingValueAdded/SaveServiceStatus', + method: 'post', + data: parameter + }) +} + +export function CancelServiceStatus (parameter) { + return axios({ + url: '/BookingValueAdded/CancelServiceStatus', + method: 'post', + data: parameter + }) +} diff --git a/src/components/MultiTab/MultiTab.vue b/src/components/MultiTab/MultiTab.vue index d2bc508..4f39606 100644 --- a/src/components/MultiTab/MultiTab.vue +++ b/src/components/MultiTab/MultiTab.vue @@ -48,7 +48,7 @@ export default { onEdit(targetKey, action) { const _that = this if (targetKey.includes('BookingDetail')) { - console.log(Object.keys(this.needSavePages).includes(targetKey), this.needSavePages[targetKey].details, this.needSavePages[targetKey].hbList) + console.log(Object.keys(this.needSavePages).includes(targetKey), this.needSavePages[targetKey], this.needSavePages[targetKey]) if ( Object.keys(this.needSavePages).includes(targetKey) && (this.needSavePages[targetKey].details || this.needSavePages[targetKey].hbList) diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js index 3f1d1df..ebe1d8a 100644 --- a/src/router/generator-routers.js +++ b/src/router/generator-routers.js @@ -37,6 +37,7 @@ const constantRouterComponents = { TaskOriginalLost: () => import('@/views/main/Taskmanage/TaskOriginalLost'), TaskChangeShip: () => import('@/views/main/Taskmanage/TaskChangeShip'), BcFileDetail: () => import('@/views/main/Taskmanage/BcFileDetail'), + BookingDetailTest: () => import('@/views/main/BookingLedger/detail/BookingDetailTest'), BookingCustomerDetail: () => import('@/views/main/BookingCustomerLedger/detail') } diff --git a/src/store/getters.js b/src/store/getters.js index 5821324..1f9dddc 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -28,6 +28,7 @@ const getters = { ctnallList: state => state.booking.ctnallList, copyPages: state => state.booking.copyPages, saveNeedNumber: state => state.booking.saveNeedNumber, + deleteId: state => state.booking.deleteId, saveNeedCar: state => state.booking.saveNeedCar, lineList: state => state.booking.lineList, bookingInitData: state => state.booking.bookingInitData, diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js index 7fa8be8..053b6e4 100644 --- a/src/store/modules/booking.js +++ b/src/store/modules/booking.js @@ -20,6 +20,7 @@ const booking = { copyPages: { number: 0, path: '' }, yardList: [], saveNeedNumber: '', + deleteId:'', saveFlag: false, packageList: [], issuetypeList: [], @@ -109,6 +110,9 @@ const booking = { SET_SAVENEEDNUMBER: (state, id) => { state.saveNeedNumber = id }, + SET_DELETEID: (state, id) => { + state.deleteId = id + }, SET_SAVENEEDCar: (state, id) => { state.saveNeedCar = id } diff --git a/src/views/main/BookingLedger/detail/BookingDetailTest.vue b/src/views/main/BookingLedger/detail/BookingDetailTest.vue new file mode 100644 index 0000000..d1049cb --- /dev/null +++ b/src/views/main/BookingLedger/detail/BookingDetailTest.vue @@ -0,0 +1,1825 @@ + + + diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 0c163d7..e971f00 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1190,9 +1190,6 @@ export default { }) .then(res => { if (res.success) { - if (res.data.statuslog) { - res.data.statuslog = res.data.statuslog.reverse() - } this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...res.data }) setTimeout(() => { this.checkSaveFun({ type: 'details', hasChange: false }) @@ -1800,6 +1797,7 @@ export default { const removeIcon = document.getElementsByClassName('ant-tabs-tab-active')[0].getElementsByTagName('i')[0] removeIcon.click() this.$forceUpdate() + this.$store.commit('SET_DELETEID', this.bookingDetails.id) } else { this.$message.error(res.message) } diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue index 5725b03..415b290 100644 --- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue @@ -818,6 +818,11 @@ export default { this.details.goodsname = res.goodsNameEN || '' } else if (type === 'cargoid') { this.details.cargoid = res.code || '' + if (res.code == 'R') { + this.rules['description'][0].required = true + } else { + this.rules['description'][0].required = false + } } else if (['kindpkgs'].includes(type)) { this.details.kindpkgs = res['name'] || '' const enCapitalRes = this.SetTOTALNO(this.details.pkgs) diff --git a/src/views/main/BookingLedger/detail/modules/rightContentTest.vue b/src/views/main/BookingLedger/detail/modules/rightContentTest.vue new file mode 100644 index 0000000..9c75381 --- /dev/null +++ b/src/views/main/BookingLedger/detail/modules/rightContentTest.vue @@ -0,0 +1,1308 @@ + + + diff --git a/src/views/main/BookingLedger/detail/modules/sedOrder.vue b/src/views/main/BookingLedger/detail/modules/sedOrder.vue index 9b969b2..6fc9a9d 100644 --- a/src/views/main/BookingLedger/detail/modules/sedOrder.vue +++ b/src/views/main/BookingLedger/detail/modules/sedOrder.vue @@ -114,6 +114,7 @@ :details="editDetails" :rules="tableRules" isParent="parent" + @changectnall="changectnall" @changeDetail="changeDetailFun" @changeTotal="changeTotalFun" @changeCtnInfo="changeCtnInfoFun"> @@ -583,7 +584,7 @@ export default { var o2keys = Object.keys(object2) if (o2keys.length !== o1keys.length) return false for (let i = 0; i <= o1keys.length - 1; i++) { - let key = o1keys[i] + const key = o1keys[i] if (!o2keys.includes(key)) return false if (object2[key] !== object1[key]) return false } @@ -598,13 +599,27 @@ export default { this.editDetails.kgs = val || this.editDetails.kgs } else if (type === 'totalPkgs') { this.editDetails.pkgs = val || this.editDetails.pkgs + const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.editDetails.pkgs) + this.editDetails.totalno = enCapitalRes } else if (type === 'totalCbm') { this.editDetails.cbm = val || this.editDetails.cbm } }, + changectnall(arr) { + let str = '' + arr.forEach((item, index) => { + str += item.ctnall + '*' + item.ctnnum + if (index != arr.length - 1) { + str += '/' + } + }) + this.editDetails.cntrtotal = str + }, changeCtnInfoFun({ type, val }) { if (type === 'kindpkgs') { this.editDetails.kindpkgs = val + const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.editDetails.pkgs) + this.editDetails.totalno = enCapitalRes } }, bookingOrderSave() { diff --git a/src/views/main/BookingLedger/detail/style/rightContent.less b/src/views/main/BookingLedger/detail/style/rightContent.less index a290440..71a23ac 100644 --- a/src/views/main/BookingLedger/detail/style/rightContent.less +++ b/src/views/main/BookingLedger/detail/style/rightContent.less @@ -145,6 +145,15 @@ color: #fff; } } + .items1{ + border: 0px ; + padding:0px ; + margin: 0px ; + margin-right: 5px; + &.active { + padding: 0 8px; + } + } .remark { padding-bottom: 8px; display: flex; diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index dd67d10..0e57a11 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -11,7 +11,7 @@ @@ -29,7 +29,7 @@ - + @@ -94,9 +94,9 @@
删除
定时订舱
-
+
小票状态
运踪订阅
@@ -141,7 +141,7 @@ v-bind="gridOptions" row-class-name="line-box" :height="tableHeight" - :row-config="{ isHover: true,isCurrent: true }" + :row-config="{ isHover: true, isCurrent: true }" :checkbox_config="{ checkField: 'checked' }" :checkbox-config="{ highlight: true }" :scroll-x="{ gt: 10, oSize: 10, enabled: false }" @@ -206,7 +206,11 @@ @@ -229,9 +233,16 @@
- + - +
@@ -982,7 +1038,7 @@ export default { } }, computed: { - ...mapGetters(['bookingList', 'bookingGridOptions', 'firstFlag', 'saveNeedNumber']) + ...mapGetters(['bookingList', 'bookingGridOptions', 'firstFlag', 'saveNeedNumber', 'deleteId']) }, beforeRouteLeave(to, from, next) { this.setBookingGridOptions(this.gridOptions) @@ -1000,17 +1056,31 @@ export default { handler(nD, oD) { if (nD.name === 'booking_ledger') { if (this.saveNeedNumber !== null) { - let index = 0 + let index = -1 this.gridOptions.data.forEach((ite, inde) => { if (ite.id === this.saveNeedNumber) { index = inde } }) - this.getListByone(this.saveNeedNumber, index) + if (index !== -1) { + this.getListByone(this.saveNeedNumber, index) + } } - if (this.firstFlag && this.saveNeedNumber === null) { + if (this.firstFlag && this.saveNeedNumber === null && !this.deleteId) { this.getList(this.searchData) } + if (this.deleteId !== null) { + let index = -1 + this.gridOptions.data.forEach((ite, inde) => { + if (ite.id === this.deleteId) { + index = inde + } + }) + console.log(index) + if (index !== -1) { + this.gridOptions.data.splice(index, 1) + } + } this.setInBookingDetailsSave(false) } } @@ -3643,10 +3713,11 @@ export default { } diff --git a/src/views/main/BookingLedger/list/indexTest.vue b/src/views/main/BookingLedger/list/indexTest.vue index 8ce891b..16e377c 100644 --- a/src/views/main/BookingLedger/list/indexTest.vue +++ b/src/views/main/BookingLedger/list/indexTest.vue @@ -11,9 +11,9 @@ - + @@ -95,7 +95,8 @@
定时订舱
- 刷新运踪
+ 刷新运踪 +
小票状态
运踪订阅
@@ -126,7 +127,7 @@ -