From 98630dcede24699dbb530a0d6298b61abad3712f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Fri, 2 Dec 2022 17:28:17 +0800 Subject: [PATCH 01/12] 12/2 --- src/components/MultiTab/MultiTab.vue | 37 ++++++++++++------- src/views/main/BookingLedger/detail/index.vue | 14 ++++++- src/views/main/BookingLedger/list/index.vue | 5 +-- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/components/MultiTab/MultiTab.vue b/src/components/MultiTab/MultiTab.vue index 7fc1706..c8cd4f8 100644 --- a/src/components/MultiTab/MultiTab.vue +++ b/src/components/MultiTab/MultiTab.vue @@ -42,20 +42,29 @@ export default { }, methods: { onEdit(targetKey, action) { - // let _that = this - // if (targetKey.split('?')[0] == '/BookingDetail') { - // this.$confirm({ - // title: '请确认无未保存数据！', - // content: '当点击确定按钮时，此页面 将会关闭。', - // onOk() { - // _that[action](targetKey) - // }, - // onCancel() {} - // }) - // } else { - // this[action](targetKey) - // } - this[action](targetKey) + let _that = this + let data = Object.fromEntries(new URLSearchParams(targetKey.split('?')[1])) + console.log(targetKey.split('?')[0] == '/BookingDetail') + console.log(localStorage.getItem(data.id)) + console.log(localStorage.getItem(data.id) == 'true') + console.log(data.id != null) + console.log( + targetKey.split('?')[0] == '/BookingDetail' && data.id != null && localStorage.getItem(data.id) == 'true' + ) + if (targetKey.split('?')[0] == '/BookingDetail' && data.id != null && localStorage.getItem(data.id) == 'true') { + this.$confirm({ + title: '请确认无未保存数据！', + content: '当点击确定按钮时，此页面 将会关闭。', + onOk() { + _that[action](targetKey) + localStorage.removeItem(data.id) + }, + onCancel() {} + }) + } else { + this[action](targetKey) + localStorage.removeItem(data.id) + } console.log('关闭？', targetKey, action) }, remove(targetKey) { diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 1d9f22f..8d4341c 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -158,7 +158,8 @@ export default { watch: { bookingDetails: { handler(nval, oval) { - // console.log('父级 -- 数据改变', nval) + console.log('改了', nval, oval) + localStorage.setItem(`${this.id}`, true) }, deep: true } @@ -166,7 +167,11 @@ export default { created() { this.init() }, + updated() { + localStorage.setItem(`${this.id}`, false) + }, beforeRouteUpdate(to, from, next) { + console.log('beforeRouteUpdate') if (!Object.keys(this.historyData).includes(this.$route.query.id)) { const hisData = { bookingDetails: this.bookingDetails, @@ -184,6 +189,7 @@ export default { this.getRouterHis() }, beforeRouteLeave(to, from, next) { + console.log('beforeRouteLeave') if (!Object.keys(this.historyData).includes(this.id)) { const hisData = { bookingDetails: this.bookingDetails, @@ -210,6 +216,7 @@ export default { }, methods: { getRouterHis() { + console.log('getRouterHis') const newId = this.$route.query.id if (Object.keys(this.historyData).includes(newId)) { // const newType = this.$route.query.type @@ -236,6 +243,7 @@ export default { } }, init() { + console.log('addSedList') this.bookingDetails = {} if (this.id) { this.isAdd = false @@ -373,6 +381,7 @@ export default { }, getDetail() { + console.log('getDetail') if (this.inPageLoading) { return false } @@ -399,6 +408,7 @@ export default { } this.$set(this, 'bookingDetails', res.data) this.$forceUpdate() + console.log('bookingDetails', this.bookingDetails) }) .catch(err => { console.log(err) @@ -406,6 +416,7 @@ export default { }, changeDetailFun(data) { + console.log('changeDetailFun') const { detail, type } = data this.bookingDetails = detail }, @@ -521,6 +532,7 @@ export default { }) }, addSedList() { + console.log('addSedList') if (this.isAdd) { this.$message.error('请先保存主单') return false diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 4629d44..fb85997 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -380,7 +380,6 @@ export default { Object.keys(this.formRes).map((item, index) => { this.formRes[item] = '' }) - debugger this.init() }, @@ -551,7 +550,7 @@ export default { this.moreNumVisible = false }, - resizableChange () { + resizableChange() { console.log('==== 列宽拖动 =====') } } @@ -596,7 +595,7 @@ export default { diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue index 1973535..1ac1a4f 100644 --- a/src/views/main/Customer/index.vue +++ b/src/views/main/Customer/index.vue @@ -58,6 +58,7 @@ Date: Tue, 6 Dec 2022 11:18:49 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modular/main/BookingLedger.js | 8 + .../detail/modules/operationArea.vue | 148 +++++++++++------- 2 files changed, 101 insertions(+), 55 deletions(-) diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index dea094f..b789076 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -568,3 +568,11 @@ export function BookingOrderAddOrUpdate(parameter) { data: parameter }) } +export function BookingOrderPrintTemplateList(parameter) { + return axios({ + url: '/BookingOrder/PrintTemplateList', + method: 'get', + params: parameter + }) +} +// diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index e6b6fff..49415d8 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -414,28 +414,30 @@
-
- - - pdf - - - xlsx - - - docx - - +
+

默认打印格式为pdf,如需其他格式请选择

+

+ 打印格式： + + pdf + xlsx + docx + +

- - {{ item.name }} - + + + ·{{ item.typeName }} + +
- @@ -499,7 +501,8 @@ import { BookingOrderDownloadPrint, BookingOrderOcrUpFile, BookingOrderOcrGetImg, - BookingOrderOcrGetText + BookingOrderOcrGetText, + BookingOrderPrintTemplateList } from '@/api/modular/main/BookingLedger' import axios from 'axios' @@ -597,7 +600,10 @@ export default { }, mounted() { this.BCvData = [...this.CvData] - this.templateType = this.$options.filters['dictData']('booking_template_type') + // this.templateType = this.$options.filters['dictData']('booking_template_type') + BookingOrderPrintTemplateList().then(res => { + this.templateType = res.data + }) // if (this.id) { // this.getLetterYard() // } @@ -710,23 +716,32 @@ export default { this.$message.error(res.message) } else { this.$message.success(`预览打印文件 ${res.data} 中...`) - console.log(res.data) + let PrintType = 'pdf' + switch (this.PrintType) { + case '1': + PrintType = 'pdf' + break + case '2': + PrintType = 'xlsx' + break + default: + PrintType = 'docx' + break + } BookingOrderDownloadPrint({ fileName: res.data }).then(res2 => { - const blob = new Blob([res2], { type: 'application/pdf;chartset=UTF-8' }) - - // const exportName = res.data - // const link = document.createElement('a') - // link.download = exportName - // link.style.display = 'none' - // link.href = URL.createObjectURL(blob) - // console.log(URL.createObjectURL(blob)) - window.open(URL.createObjectURL(blob), '_blank') - // link.setAttribute('download', exportName) - // document.body.appendChild(link) - // console.log(link) - // link.click() - // URL.revokeObjectURL(link.href) - // document.body.removeChild(link) + const blob = new Blob([res2], { type: `application/${PrintType};chartset=UTF-8` }) + if (this.PrintType == '1') { + window.open(URL.createObjectURL(blob), '_blank') + } else { + const link = document.createElement('a') + link.style.display = 'none' + link.href = URL.createObjectURL(blob) + link.download = res.data + document.body.appendChild(link) + link.click() + URL.revokeObjectURL(link.href) // 释放URL对象 + document.body.removeChild(link) + } }) } }) @@ -1301,18 +1316,41 @@ export default { .PrintMain { display: flex; flex-wrap: wrap; - max-height: 50vh; - overflow-y: auto; - .items { - display: inline-block; - height: 28px; - line-height: 26px; - border: 1px dashed #ccc; - border-radius: 4px; - padding: 0 10px; - font-size: 13px; - cursor: pointer; - margin: 5px 10px; + + .PrintTitle { + width: 100%; + display: flex; + padding: 20px; + box-sizing: border-box; + background: #f7f8fe; + border: 2px dotted #cdcdcd; + p { + margin: 0; + &:nth-child(2) { + margin-left: 35px; + } + span { + color: #ff6646; + } + } + } + .PrintMainBox { + max-height: 50vh; + overflow-y: auto; + .items { + padding-left: 1rem; + height: 2.5rem; + line-height: 2.5rem; + border-bottom: 1px solid #ebebeb; + cursor: pointer; + &:hover { + color: #2f54eb; + } + span { + font-weight: bolder; + margin-right: 0.6rem; + } + } } } /*订舱弹窗文件功能对齐 */ @@ -1330,19 +1368,19 @@ export default { /deep/ .ant-modal-body .ant-input-affix-wrapper { position: relative; z-index: 1; - &::after{ - content:''; - position:absolute; + &::after { + content: ''; + position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: -1; background-color: @primary-color !important; - opacity: .04; + opacity: 0.04; } } -/deep/ .ant-modal-body .ant-input{ +/deep/ .ant-modal-body .ant-input { background: none; } .PrintRadio { From 26227b0b0727bf1577ffc865709677de6f14a734 Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Tue, 6 Dec 2022 11:29:27 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/modules/operationArea.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 49415d8..d601781 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -1323,7 +1323,7 @@ export default { padding: 20px; box-sizing: border-box; background: #f7f8fe; - border: 2px dotted #cdcdcd; + border: 1px dashed #cdcdcd; p { margin: 0; &:nth-child(2) { @@ -1337,6 +1337,7 @@ export default { .PrintMainBox { max-height: 50vh; overflow-y: auto; + margin-top: 5px; .items { padding-left: 1rem; height: 2.5rem; From 44d285b2a6bb129f0429c9ade816702ddc1cc755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Tue, 6 Dec 2022 14:46:57 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=8F=96=E6=B6=88=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modular/main/BookingLedger.js | 12 +++++++++++- .../main/BookingLedger/detail/modules/basicInfo.vue | 5 +++-- .../BookingLedger/detail/modules/mailingInfo.vue | 8 +++++--- src/views/main/BookingLedger/list/index.vue | 3 +-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index b789076..4e35fd9 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -36,7 +36,17 @@ export function DjyCustomerpage(parameter) { params: parameter }) } - +/** + * 获取分页查询客户 + * @params keyword + */ +export function DjyCustomerSuggest(parameter) { + return axios({ + url: '/DjyCustomer/Suggest', + method: 'get', + params: parameter + }) +} /** * 获取船公司 * @params CnName diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index 715564a..c67b025 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -428,6 +428,7 @@ import { XCard } from '@/components' import { AutoComplete } from 'ant-design-vue' import { DjyCustomerpage, + DjyCustomerSuggest, GetCarrierlist, GetVessellist, GetSysUserPage, @@ -835,10 +836,10 @@ export default { }, // 客户 - start getDjyCustomerpage(name = '', type, key) { - DjyCustomerpage({ + DjyCustomerSuggest({ // SearchValue: name, // PropString: key, - ShortName: name + keyword: name }) .then(res => { if (res.code === 200) { diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index e318735..a8a5f55 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue @@ -877,9 +877,11 @@ export default { }, mounted() { const shipperScroll = document.getElementById('shipper-scroll') - shipperScroll.addEventListener('scroll', () => { - document.getElementById('shipper-scroll-right').scrollTop = shipperScroll.scrollTop - }) + if (shipperScroll) { + shipperScroll.addEventListener('scroll', () => { + document.getElementById('shipper-scroll-right').scrollTop = shipperScroll.scrollTop + }) + } const consigneeScroll = document.getElementById('consignee-scroll') consigneeScroll.addEventListener('scroll', () => { document.getElementById('consignee-scroll-right').scrollTop = consigneeScroll.scrollTop diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index fb85997..d221233 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -346,8 +346,7 @@ export default { const arr = this.formRes.MBLNO.split(/-|，|,|[.]/) let val = `` arr.map((item, index) => { - val += `${item} -` + val += `${item}` }) this.moreNumVal = val this.moreNumVisible = !this.moreNumVisible From abb4958e8b474ea0c41ff9f810c76e27fc8846e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Tue, 6 Dec 2022 15:00:28 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E6=97=A0=E7=94=A8?= =?UTF-8?q?=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/index.vue | 23 ------------------- .../BookingLedger/detail/modules/billInfo.vue | 2 -- .../detail/modules/goodsTable.vue | 4 ---- .../detail/modules/mailingInfo.vue | 6 ----- .../detail/modules/operationArea.vue | 14 ----------- src/views/main/BookingLedger/list/index.vue | 11 --------- .../BookingLedger/list/modules/formLabel.vue | 2 +- 7 files changed, 1 insertion(+), 61 deletions(-) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 9a852a9..464edd0 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -145,7 +145,6 @@ export default { computed: { ...mapGetters(['bookingList']), Showtabs() { - console.log(this.bookingDetails, 'bookingDetails') let Rdata = true if (this.bookingDetails.hbList && this.bookingDetails.hbList.length) { Rdata = false @@ -158,7 +157,6 @@ export default { watch: { bookingDetails: { handler(nval, oval) { - console.log('改了', nval, oval) localStorage.setItem(`${this.id}`, true) }, deep: true @@ -171,7 +169,6 @@ export default { localStorage.setItem(`${this.id}`, false) }, beforeRouteUpdate(to, from, next) { - console.log('beforeRouteUpdate') if (!Object.keys(this.historyData).includes(this.$route.query.id)) { const hisData = { bookingDetails: this.bookingDetails, @@ -189,7 +186,6 @@ export default { this.getRouterHis() }, beforeRouteLeave(to, from, next) { - console.log('beforeRouteLeave') if (!Object.keys(this.historyData).includes(this.id)) { const hisData = { bookingDetails: this.bookingDetails, @@ -206,24 +202,14 @@ export default { next() }, beforeRouteEnter(to, from, next) { - console.log('进入 beforeRouteEnter: to', to.name) - console.log('进入 beforeRouteEnter: from', from.name) next(vm => { - console.log('vm', vm) - console.log('进入路由之后： ', vm.$route.query.id) vm.getRouterHis() }) }, methods: { getRouterHis() { - console.log('getRouterHis') const newId = this.$route.query.id if (Object.keys(this.historyData).includes(newId)) { - // const newType = this.$route.query.type - // const newIsCopy = this.$route.query.isCopy || false - // if (newType === this.historyData[newId].type && newIsCopy === this.historyData[newId].isCopy) { - // } - console.log('4. 获取到历史数据', this.historyData[newId].bookingDetails.mblno) const $data = this.historyData[newId] this.bookingDetails = $data.bookingDetails this.excuteRules = $data.excuteRules @@ -243,7 +229,6 @@ export default { } }, init() { - console.log('addSedList') this.bookingDetails = {} if (this.id) { this.isAdd = false @@ -381,7 +366,6 @@ export default { }, getDetail() { - console.log('getDetail') if (this.inPageLoading) { return false } @@ -408,7 +392,6 @@ export default { } this.$set(this, 'bookingDetails', res.data) this.$forceUpdate() - console.log('bookingDetails', this.bookingDetails) }) .catch(err => { console.log(err) @@ -416,20 +399,17 @@ export default { }, changeDetailFun(data) { - console.log('changeDetailFun') const { detail, type } = data this.bookingDetails = detail }, bookingOrderUpdate() { - console.log('保存', this.bookingDetails) if (!this.bookingDetails.mblno) { this.$message.error('请输入提单号') return false } const _data = JSON.parse(JSON.stringify(this.bookingDetails)) delete _data.hbList - console.log(JSON.stringify(_data)) BookingOrderAddOrUpdate(_data) .then(res => { if (res.success) { @@ -448,7 +428,6 @@ export default { }, bookingOrderAdd() { - console.log('新增', this.bookingDetails) if (!this.bookingDetails.mblno) { this.$message.error('请输入提单号') return false @@ -480,7 +459,6 @@ export default { }, changeTab(e) { - console.log(e) this.tabActiveKey = e }, @@ -539,7 +517,6 @@ export default { }) }, addSedList() { - console.log('addSedList') if (this.isAdd) { this.$message.error('请先保存主单') return false diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index ab72d0f..3e51b79 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -372,7 +372,6 @@ export default { watch: { details: { handler(nval, oval) { - // console.log('数据改变', nval) this.$emit('changeDetail', { detail: nval, type: 'billInfo' @@ -506,7 +505,6 @@ export default { }, handleIssuetypeChange(index) { this.details.issuetype = this.issuetypeSelectData[index].enName - console.log(this.details.issuetype) }, filterOption(input, option) { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index d162315..55ce72f 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -646,7 +646,6 @@ export default { watch: { details: { handler(nval, oval) { - // console.log('detail数据改变', nval) this.$emit('changeDetail', { detail: nval, type: 'goodsTable' @@ -657,7 +656,6 @@ export default { tableData: { handler(nval, oval) { this.details.ctnInputs = nval - // console.log('table数据改变', nval) }, deep: true } @@ -669,7 +667,6 @@ export default { methods: { init() { - console.log('init', this.details.ctnInputs) if (Object.keys(this.details).length > 0) { const arr = [] const totalCtnall = {} @@ -780,7 +777,6 @@ export default { this.$message.error('请选择数据') return false } - console.log(this.childModelSelect) let $pkgs = 0 let $kgs = 0 let $cbm = 0 diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index a8a5f55..bfe9b0c 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue @@ -679,7 +679,6 @@ export default { watch: { details: { handler(nval, oval) { - // console.log('数据改变', nval) this.$emit('changeDetail', { detail: nval, type: 'mailingInfo' @@ -1004,7 +1003,6 @@ export default { handleYardChange(index) { this.details.yard = this.yardSelectData[index].name this.details.yardid = this.yardSelectData[index].code - console.log(this.details.yard, this.details.yardid) }, filterOption(input, option) { return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 @@ -1136,7 +1134,6 @@ export default { .then(res => { if (res.code === 200) { this[`${type}Data`] = res.data.rows - console.log(this[`${type}DataArr`]) this.$forceUpdate() } }) @@ -1215,7 +1212,6 @@ export default { changeCodeRemove(num, type) { const newStr = this.details[type].replace(/\n|\r/g, '') - console.log(newStr) const indexs = [] let count = 0 for (let i = 0; i < newStr.length - 1; i++) { @@ -1229,9 +1225,7 @@ export default { let resStr = `` splitPosition.map((split, sindex) => { const start = sindex === 0 ? 0 : splitPosition[sindex - 1] - console.log(sindex, start, newStr.slice(start, split)) if (sindex === splitPosition.length - 1) { - console.log('last', newStr.slice(start, split), newStr.slice(split)) resStr += `${newStr.slice(start, split)} ${newStr.slice(split)}` } else { diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index d601781..cdf8535 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -622,9 +622,7 @@ export default { FnClickCvBox(data) { this.details[data.code] = this.details[data.code] + this.Rdata this.CvBoxType = false - console.log(this.BCvData) this.BCvData.forEach((item, index) => { - console.log(item) if (item.code == data.code) { this.BCvData.splice(index, 1) this.BCvData.push(item) @@ -711,7 +709,6 @@ export default { this.$message.success(`搜索文件中...`) BookingOrderPrint({ typeCode, bookingId: this.id, type: this.PrintType }) .then(res => { - console.log(res) if (!res.success) { this.$message.error(res.message) } else { @@ -821,7 +818,6 @@ export default { this.EDIUloading = false }) .catch(err => { - console.log(err) this.EDISloading = false this.EDIUloading = false }) @@ -853,7 +849,6 @@ export default { title: '温馨提示', content: content, onOk() { - console.log('OK') if (type === 'vgm') { _this.vgmSend() } else if (type === 'paper') { @@ -902,7 +897,6 @@ export default { getLetterYard() { LetterYard(this.id) .then(res => { - console.log('== 放舱信息 ==', res.data) if (res.success) { this.initCabinFrom = { ...this.initCabinFrom, ...res.data } } else { @@ -918,7 +912,6 @@ export default { getSampleBill() { SampleBill(this.id) .then(res => { - console.log('== 样单信息 ==', res.data) if (res.success) { this.initCabinFrom = res.data } else { @@ -934,7 +927,6 @@ export default { getVgmLink() { VgmLink(this.id) .then(res => { - console.log('== VGM信息 ==', res.data) if (res.success) { // this.initCabinFrom = res.data } else { @@ -983,7 +975,6 @@ export default { }, bookingCheckChange(e) { this.bookingModelFrom.useForwarderCode = e.target.checked - console.log(e.target.checked) }, // 放舱 vgm 等保存按钮 @@ -1049,7 +1040,6 @@ export default { this.SaveLoading = false }) .catch(err => { - console.log(err) this.SaveLoading = false }) }, @@ -1066,7 +1056,6 @@ export default { this.SaveLoading = false }) .catch(err => { - console.log(err) this.SaveLoading = false }) }, @@ -1083,7 +1072,6 @@ export default { this.SendLoading = false }) .catch(err => { - console.log(err) this.SendLoading = false }) }, @@ -1092,7 +1080,6 @@ export default { TxxpLink(this.id) .then(res => { if (res.success) { - console.log(res.data) this.copyFun(res.data) } else { this.$message.error(res.message) @@ -1121,7 +1108,6 @@ export default { .catch(err => { this.$message.destroy() this.$message.success({ content: '校验失败' }) - console.log(err) }) }, diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index d221233..2d7bf66 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -252,7 +252,6 @@ export default { this.$message.success('复制成功!') }, init(queryParam = {}) { - console.log(queryParam, 'queryParam') this.gridOptions.pagerConfig = { total: 0, currentPage: 1, @@ -303,7 +302,6 @@ export default { this.$set(this.formRes, item.label, this.formRes[item.label] || '') }) this.getList(this.formRes) - console.log('=== 当前数据 ===', this.formRes, this.formData, this.formMoreData) const len = this.formData.length % 4 if (len > 2) { this.formBtnCol = 24 @@ -325,7 +323,6 @@ export default { this.formMoreTableData = moreTableArr }, handlePageChange({ currentPage, pageSize }) { - console.log(currentPage, pageSize) this.gridOptions.pagerConfig.currentPage = currentPage this.gridOptions.pagerConfig.pageSize = pageSize this.getList(this.formRes) @@ -337,9 +334,7 @@ export default { }, tableRefresh() { let data = { ...this.formRes } - console.log(data, 1) this.init(this.formRes) - console.log(data, 2) this.formRes = data }, tableMoreRefresh() { @@ -408,7 +403,6 @@ export default { } else if (form.type === 'select') { // 根据逻辑填写内容 } - console.log(this.formRes) this.$forceUpdate() }, @@ -429,7 +423,6 @@ export default { return item.label }) this.$refs.setTableForm.handleCancel() - console.log(data, arr) }, columnChange(data) { @@ -442,14 +435,12 @@ export default { this.showColumns = [] this.showColumns = arr this.gridOptions.columns = arr - console.log('=新的clomn=', this.columns) this.$forceUpdate() }, handledbclick({ row }) { this.editColumns(row) }, editColumns(row) { - console.log(row) this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } }) }, getList(queryParam = {}) { @@ -477,10 +468,8 @@ export default { this.gridOptions.data.map(($item, $index) => { this.$set(bookingList, $item.id, $item) }) - console.log(bookingList) this.setBookingList(bookingList) this.$forceUpdate() - console.log('======分页数据======', this.gridOptions.data) } else { this.$set(this.gridOptions, 'data', [...[]]) this.$set(this.gridOptions, 'loading', false) diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue index 718ab55..6469606 100644 --- a/src/views/main/BookingLedger/list/modules/formLabel.vue +++ b/src/views/main/BookingLedger/list/modules/formLabel.vue @@ -37,7 +37,7 @@ export default { watch: { formRes: { handler(nval, oval) { - console.log('编辑结果发生变化', nval, oval) + // console.log('编辑结果发生变化', nval, oval) // if (Object.keys(nval).length > 0 && nval && oval) { // this.value = nval[this.labelData.type] // } From 64c4f5bce19b8136fe43f5765cf813db52cb68ea Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Tue, 6 Dec 2022 15:24:44 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2title=E5=8A=A0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/views/main/Customer/addForm.vue | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 5aaa34e..2283547 100644 --- a/public/index.html +++ b/public/index.html @@ -95,7 +95,7 @@ <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> <% } %> - + diff --git a/src/views/main/Customer/addForm.vue b/src/views/main/Customer/addForm.vue index 3a677a4..c88e620 100644 --- a/src/views/main/Customer/addForm.vue +++ b/src/views/main/Customer/addForm.vue @@ -17,7 +17,7 @@ -

基本信息

+

基本信息

 -

联系人信息

+

联系人信息

-

财务信息

+

财务信息

@@ -376,11 +376,21 @@ export default { background: #fff; padding: 25px; } +.CsForm .ant-form-item{ + margin-bottom: 10px; +} .CsFormTitle { - border-bottom: 1px solid #c9c9c9; + border-bottom: 1px solid #d9d9d9; + padding-bottom: 5px; + font-weight: bold; + color: #333; + margin-bottom: 25px; } .CsFormTitle > span { padding: 0.25rem 0.5rem 0 0.5rem; /* border: 1px solid #c9c9c9; */ } +.CsFormTitle span i{ + margin-right: 7px; +} From de147f5bab2327ea7ae77780d8d7176ab8bfa05c Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Tue, 6 Dec 2022 15:35:59 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7title?= =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/Customer/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/main/Customer/addForm.vue b/src/views/main/Customer/addForm.vue index c88e620..a7c5cf5 100644 --- a/src/views/main/Customer/addForm.vue +++ b/src/views/main/Customer/addForm.vue @@ -388,7 +388,7 @@ export default { } .CsFormTitle > span { padding: 0.25rem 0.5rem 0 0.5rem; - /* border: 1px solid #c9c9c9; */ + /* border: 1px solid #c9c9c9; */ } .CsFormTitle span i{ margin-right: 7px; From d3a378f8461996d2004eb51ece0dc325d5a0b78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Tue, 6 Dec 2022 17:54:47 +0800 Subject: [PATCH 11/12] 12/6 --- src/views/main/BookingLedger/detail/modules/rightContent.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index a30a59e..bcf41cf 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -428,7 +428,6 @@ export default { this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'application/pdf;charset=utf-8' })) const fname = data.fileName // 下载文件的名字 const link = document.createElement('a') - console.log(this.pdfUrl) link.href = this.pdfUrl link.setAttribute('download', fname) document.body.appendChild(link) From 42c87b1bb5a1764959d37238ad2c34b2615f970e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Tue, 6 Dec 2022 17:58:48 +0800 Subject: [PATCH 12/12] 12/6 --- src/views/main/BookingLedger/detail/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 464edd0..c136c36 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -487,13 +487,13 @@ export default { this.$message.error('当前已经是第一票') return false } - // const prevId = arr[index - 1] - // const prevType = this.bookingList[prevId].carrierid - // this.$router.replace({ - // name: 'BookingDetail', - // query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno } - // }) - this.$route.query.id = 1123 + const prevId = arr[index - 1] + const prevType = this.bookingList[prevId].carrierid + this.$router.replace({ + name: 'BookingDetail', + query: { id: prevId, type: prevType, mblno: this.bookingList[prevId].mblno } + }) + // this.$route.query.id = 1123 } else { if (index === arr.length - 1) { this.$message.error('当前已经是最后一票')