From a63d735f163bf0d97130fc2e04feee8c8deb6da8 Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Fri, 30 Dec 2022 11:15:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/modules/operationArea.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index fa83a86..f9f1a36 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -28,7 +28,7 @@ - + + + diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 1d57a92..eaed6c6 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -347,7 +347,8 @@ export default { { label: '起运港', value: '1' }, { label: '目的港', value: '2' } ], - traceValue: [] + traceValue: [], + addNum: 0 } }, created() { @@ -720,7 +721,8 @@ export default { }, addSubmit() { this.addVisible = false - this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio } }) + this.addNum = Math.round(Math.random() * 1000) + this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio, addNum: this.addNum } }) }, addCancel() { this.addVisible = false From ac1d71de8141c33a7dbd68d9583487109260a212 Mon Sep 17 00:00:00 2001 From: lilu Date: Fri, 30 Dec 2022 17:12:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/components/sedOrder.vue | 2 +- src/views/main/BookingLedger/detail/index.vue | 12 +- .../detail/modules/goodsTable.vue | 48 ++--- .../detail/modules/operationArea.vue | 195 ++++++++++++++++-- src/views/main/BookingLedger/list/index.vue | 26 ++- 5 files changed, 233 insertions(+), 50 deletions(-) diff --git a/src/views/main/BookingLedger/detail/components/sedOrder.vue b/src/views/main/BookingLedger/detail/components/sedOrder.vue index 7006e92..21ce60b 100644 --- a/src/views/main/BookingLedger/detail/components/sedOrder.vue +++ b/src/views/main/BookingLedger/detail/components/sedOrder.vue @@ -289,7 +289,7 @@ export default { } let data = JSON.parse(JSON.stringify(this.editDetails)) delete data.isNoSave - data.parentId = this.$route.query.id + data.parentid = this.$route.query.id data.id = 0 data.ctnInputs.map((item, index) => { item.id = 0 diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 9d4d75d..a8ad682 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -426,6 +426,9 @@ export default { this.tabActiveKey = $data.tabActiveKey this.isCopy = this.$route.query.isCopy this.inPageLoading = false + if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { + this.Showtabs = true + } setTimeout(() => { this.inChildLoading = false if (!Object.keys(this.needSavePages).includes(this.$route.fullPath)) { @@ -448,6 +451,9 @@ export default { // console.log('== 新增复制, 这里置空了提单号 ==') this.bookingDetails.mblno = '' } + if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { + this.Showtabs = true + } setTimeout(() => { this.inChildLoading = false if (!Object.keys(this.needSavePages).includes(this.$route.fullPath)) { @@ -465,6 +471,9 @@ export default { this.tabActiveKey = $data.tabActiveKey this.isCopy = this.$route.query.isCopy this.inPageLoading = false + if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { + this.Showtabs = true + } // console.log('== 复制参数 ==', $data.isCopy, this.$route.query.isCopy, this.isCopy) if (this.isCopy && !$data.isCopy) { // console.log('== 新增复制, 这里置空了提单号 ==') @@ -660,7 +669,7 @@ export default { this.isAdd = false this.id = res.data this.$message.success('保存成功') - this.bookingDetails = JSON.parse(JSON.stringify(initDetail)) + // this.bookingDetails = JSON.parse(JSON.stringify(initDetail)) this.$router.replace({ name: 'BookingDetail', query: { @@ -715,7 +724,6 @@ export default { Object.keys(this.needSavePages).includes(key) && (this.needSavePages[key].details || this.needSavePages[key].hbList) ) { - // console.log('== 切换上一票下一票 - biu 弹窗出现 ==') this.$confirm({ title: '请确认无未保存数据！', content: '当点击确定按钮时，此页面 将会关闭。', diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index c6085df..ce6a90c 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -21,6 +21,7 @@ :columns="columns" :table-data="tableData" borderY + style="min-width:970;" :cell-autofill-option="cellAutofillOption" :editOption="editOption" rowKeyFieldName="rowKey" @@ -120,32 +121,30 @@ export default { renderBodyCell: ({ row, column, rowIndex }, h) => { return ( // - // { - // - // } - // { - // - // - // - // } - // + // allowClear={true} + // value={row['ctnall']} + // class="customer-input" + // > + // { + // + // } + // { + // + // + // + // } + // { @@ -204,6 +203,7 @@ export default { return ( - {{ details.yard || '--' }} + + + + {{ yard.selectShowTab }} + + @@ -291,7 +305,7 @@ :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback > - {{ details.yardcontract || '--' }} + @@ -301,7 +315,7 @@ :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback > - {{ details.yardcontracttel || '--' }} + @@ -311,7 +325,16 @@ :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback > - {{ details.closingdate || '--' }} + + + + @@ -321,7 +344,16 @@ :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback > - {{ details.closedocdate || '--' }} + + + + @@ -331,7 +363,16 @@ :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback > - {{ details.closevgmdate || '--' }} + + + + @@ -345,6 +386,7 @@ >
{ if (res.success) { @@ -1514,6 +1567,52 @@ export default { .catch(err => { console.log(err) }) + }, + getYardlist(name = '') { + GetYardlist({ + keyword: name + }) + .then(res => { + if (res.code === 200) { + this.yardData = res.data + const arr = [] + res.data.map((item, index) => { + arr.push({ + ...{ selectShowTab: item.name + ' / ' + item.code }, + ...item + }) + }) + this.yardSelectData = arr + this.$forceUpdate() + } + }) + .catch(err => { + console.log(err) + }) + }, + yardSelect(value) { + this.details.yard = value + const index = this.yardDataArr.indexOf(value) + this.details.yardid = this.yardData[index].code + }, + yardChange(value) { + // this.getYardlist(value) + }, + handleYardChange(index) { + this.initCabinFrom.yard = this.yardSelectData[index].name + this.initCabinFrom.yardid = this.yardSelectData[index].code + }, + filterOption(input, option) { + return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + closingdateChange (date, dateString) { + this.initCabinFrom.closingTime = dateString + }, + closevgmdateChange (date, dateString) { + this.initCabinFrom.vgmTime = dateString + }, + closedocdateChange (date, dateString) { + this.initCabinFrom.closeDocTime = dateString } } } @@ -1771,6 +1870,66 @@ export default { 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; + } +} +/deep/ .ant-calendar-picker{ + 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-input-affix-wrapper, .ant-input-affix-wrapper-textarea-with-clear-btn{ + 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; + } +} +.remark-input{ + 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-modal-body .ant-input { background: none; } diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index eaed6c6..70749fa 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -14,7 +14,7 @@
- +