diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 712d09a..2e82fb6 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -128,6 +128,18 @@ @@ -1375,7 +1385,7 @@ export default { return false } if (this.traceValue.includes('2') && (!this.details.carrierid || !this.details.carrier)) { - this.$message.error('请选择传公司') + this.$message.error('请选择船公司') return false } const query = { @@ -1717,4 +1727,13 @@ export default { .trace-check { margin-left: 10px; } +.model-btn-list{ + margin-bottom:15px; + .btn{ + margin-right: 6px; + &.ant-btn-primary{ + color: #fff; + } + } +} diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 6d87c34..a72ebc1 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -829,8 +829,15 @@ export default { this.$message.error('请选择操作订单') return false } + let errorTip = '' select.map((item, index) => { console.log(item) + if (this.traceValue.includes('1') && (!item.yard || !item.yardid)) { + errorTip = `单号${item.mblno}未选择场站` + } + if (this.traceValue.includes('2') && (!item.carrierid || !item.carrier)) { + errorTip = `单号${item.mblno}未选择船公司` + } const query = { businessId: item.id, mblno: item.mblno, @@ -842,6 +849,12 @@ export default { } arr.push(query) }) + + if (errorTip !== '') { + this.$message.error(errorTip) + return false + } + SendTrace(arr) .then(res => { if (res.success) { @@ -1262,6 +1275,11 @@ export default { cursor: pointer; color: @primary-color; } + &:nth-of-type(3){ + i{ + opacity: 0; + } + } } } /deep/ .ant-form-item{