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/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index dea094f..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 @@ -568,3 +578,11 @@ export function BookingOrderAddOrUpdate(parameter) { data: parameter }) } +export function BookingOrderPrintTemplateList(parameter) { + return axios({ + url: '/BookingOrder/PrintTemplateList', + method: 'get', + params: parameter + }) +} +// diff --git a/src/api/modular/main/CompanySiteaccount.js b/src/api/modular/main/CompanySiteaccount.js new file mode 100644 index 0000000..96dd799 --- /dev/null +++ b/src/api/modular/main/CompanySiteaccount.js @@ -0,0 +1,53 @@ +import { axios } from '@/utils/request' + +/** + * 分页查询网站账号维护（租户公司） + * + * @author Myshipping + */ +export function DjyWebsiteAccountConfigPageTenant(parameter) { + return axios({ + url: '/DjyWebsiteAccountConfig/PageTenant', + method: 'get', + params: parameter + }) +} + +/** + * 增加网站账号维护（同一租户、同类型账号不允许重复） + * + * @author Myshipping + */ +export function DjyWebsiteAccountConfigAddTenant(parameter) { + return axios({ + url: '/DjyWebsiteAccountConfig/AddTenant', + method: 'post', + data: parameter + }) +} + +/** + * 更新网站账号维护（租户公司） + * + * @author Myshipping + */ +export function DjyWebsiteAccountConfigEditTenant(parameter) { + return axios({ + url: '/DjyWebsiteAccountConfig/EditTenant', + method: 'post', + data: parameter + }) +} + +/** + * 删除网站账号维护（租户公司） + * + * @author Myshipping + */ +export function DjyWebsiteAccountConfigDeleteTenant(parameter) { + return axios({ + url: '/DjyWebsiteAccountConfig/DeleteTenant', + method: 'post', + data: parameter + }) +} 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 17f3d85..6cad7e3 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -140,13 +140,11 @@ export default { moreStr: '', tabActiveKey: '1', historyData: {}, - noSave: false } }, computed: { ...mapGetters(['bookingList', 'needSavePages']), Showtabs() { - console.log(this.bookingDetails, 'bookingDetails') let Rdata = true if (this.bookingDetails.hbList && this.bookingDetails.hbList.length) { Rdata = false @@ -159,8 +157,7 @@ export default { watch: { bookingDetails: { handler(nval, oval) { - this.noSave = true - // console.log('父级 -- 数据改变', nval) + localStorage.setItem(`${this.id}`, true) }, deep: true } @@ -168,6 +165,9 @@ export default { created() { this.init() }, + updated() { + localStorage.setItem(`${this.id}`, false) + }, beforeRouteUpdate(to, from, next) { if (!Object.keys(this.historyData).includes(this.$route.query.id)) { const hisData = { @@ -202,11 +202,7 @@ 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() }) }, @@ -215,11 +211,6 @@ export default { 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 @@ -400,7 +391,6 @@ export default { ediAttnMail: '' } } - this.noSave = false this.$set(this, 'bookingDetails', res.data) this.$forceUpdate() }) @@ -415,20 +405,17 @@ export default { }, 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) { this.isCopy = false this.isAdd = false - this.noSave = false this.$message.success('保存成功') this.init() this.$forceUpdate() @@ -442,7 +429,6 @@ export default { }, bookingOrderAdd() { - console.log('新增', this.bookingDetails) if (!this.bookingDetails.mblno) { this.$message.error('请输入提单号') return false @@ -454,7 +440,6 @@ export default { if (res.success) { this.isAdd = false this.id = res.data - this.noSave = false this.$message.success('保存成功') this.$router.replace({ name: 'BookingDetail', @@ -475,7 +460,6 @@ export default { }, changeTab(e) { - console.log(e) this.tabActiveKey = e }, @@ -506,7 +490,11 @@ export default { } const prevId = arr[index - 1] const prevType = this.bookingList[prevId].carrierid - this.$router.replace({ name: 'BookingDetail', query: { id: prevId, type: prevType } }) + 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('当前已经是最后一票') @@ -514,7 +502,10 @@ export default { } const nextId = arr[index + 1] const nextType = this.bookingList[nextId].carrierid - this.$router.replace({ name: 'BookingDetail', query: { id: nextId, type: nextType } }) + this.$router.replace({ + name: 'BookingDetail', + query: { id: nextId, type: nextType, mblno: this.bookingList[nextId].mblno } + }) } }, handleReload() { @@ -537,9 +528,6 @@ export default { this.bookingDetails.hbList = [data] this.tabActiveKey = '2' } - }, - deactivated () { - console.log('页面销毁', this.noSave) } } diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index b0afb82..c67b025 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -14,6 +14,7 @@ :data-source="customerDataArr" @select="customerSelect" @change="customerChange" + @focus="customerChange" /> @@ -124,6 +126,7 @@ :data-source="vesselDataArr" @select="vesselSelect" @change="vesselChange" + @focus="vesselChange" /> @@ -154,6 +157,7 @@ :data-source="voynoinnerDataArr" @select="voynoinnerSelect" @change="voynoinnerChange" + @focus="voynoinnerChange" /> @@ -213,6 +217,7 @@ :data-source="lanenameDataArr" @select="lanenameSelect" @change="lanenameChange" + @focus="lanenameChange" /> @@ -225,6 +230,7 @@ :data-source="shipagencyDataArr" @select="shipagencySelect" @change="shipagencyChange" + @focus="shipagencyChange" /> @@ -259,6 +265,7 @@ :data-source="saleUserListArr" @select="saleSelect" @change="saleChange" + @focus="saleChange" /> @@ -277,6 +284,7 @@ :data-source="opUserListArr" @select="opSelect" @change="opChange" + @focus="opChange" /> @@ -295,6 +303,7 @@ :data-source="docUserListArr" @select="docSelect" @change="docChange" + @focus="docChange" /> @@ -313,6 +322,7 @@ :data-source="custserviceUserListArr" @select="custserviceSelect" @change="custserviceChange" + @focus="custserviceChange" /> @@ -418,6 +428,7 @@ import { XCard } from '@/components' import { AutoComplete } from 'ant-design-vue' import { DjyCustomerpage, + DjyCustomerSuggest, GetCarrierlist, GetVessellist, GetSysUserPage, @@ -825,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) { @@ -848,6 +859,7 @@ export default { this.details.customerid = this.customerData[index].id }, customerChange(value) { + console.log(value) // this.getCustomer(value) this.getDjyCustomerpage(value, 'customer', 'consignor') }, @@ -865,8 +877,7 @@ export default { // 船公司 - start getCarrier(name = '') { GetCarrierlist({ - CnName: name, - keyword: '' + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -914,7 +925,7 @@ export default { // 船代 - start getForwarderlist(name = '') { GetForwarderlist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -938,7 +949,7 @@ export default { // 船名 - start getVessel(name = '') { GetVessellist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index 3cb9fdd..3e51b79 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -58,10 +58,12 @@ > @@ -134,6 +136,7 @@ :data-source="prepardatDataArr" @select="prepardatSelect" @change="prepardatChange" + @focus="prepardatChange" /> @@ -151,6 +154,7 @@ :data-source="payableatDataArr" @select="payableatSelect" @change="payableatChange" + @focus="payableatChange" /> @@ -168,6 +172,7 @@ :data-source="blfrtDataArr" @select="blfrtSelect" @change="blfrtChange" + @focus="blfrtChange" /> @@ -196,6 +201,7 @@ :data-source="serviceDataArr" @select="serviceSelect" @change="serviceChange" + @focus="serviceChange" /> @@ -366,7 +372,6 @@ export default { watch: { details: { handler(nval, oval) { - // console.log('数据改变', nval) this.$emit('changeDetail', { detail: nval, type: 'billInfo' @@ -471,7 +476,7 @@ export default { // 签单方式 - start getIssuetypeList(name = '') { Codeissuetypelist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -500,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 @@ -510,7 +514,7 @@ export default { // 签单地点 - start getPortloadlist(name = '', type) { GetPortloadlist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -547,7 +551,7 @@ export default { // 到付地点 - start getPortlist(name = '', type) { GetPortlist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -572,7 +576,7 @@ export default { // 付费方式 - start getFrt(name = '') { GetFrt({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -595,7 +599,7 @@ export default { // 运输条款 - start getService(name = '') { GetService({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index 649704d..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 = {} @@ -702,7 +699,7 @@ export default { }, getCtn() { GetCtn({ - Name: '' + KeyWord: '' }) .then(res => { this.ctnList = res.data @@ -713,7 +710,7 @@ export default { }, getPackage() { GetPackage({ - Name: '' + KeyWord: '' }) .then(res => { this.packageList = res.data @@ -780,7 +777,6 @@ export default { this.$message.error('请选择数据') return false } - console.log(this.childModelSelect) let $pkgs = 0 let $kgs = 0 let $cbm = 0 @@ -1049,23 +1045,23 @@ export default { .btn-more-name, .btn-import-station, .btn-weight { - position:relative; + position: relative; border: 1px solid @primary-color; color: @primary-color; background: none; - &::after{ - content:''; - position:absolute; + &::after { + content: ''; + position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 0; background-color: @primary-color !important; - opacity: .04; + opacity: 0.04; } - &:hover{ - opacity: .7; + &:hover { + opacity: 0.7; } } } diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue index 1197d21..bfe9b0c 100644 --- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue @@ -17,10 +17,11 @@ :data-source="shipperDataArr" @select="shipperSelect" @change="shipperChange" + @focus="shipperChange" /> - 保存 + + 保存 +
* 35 @@ -54,6 +55,7 @@ :data-source="consigneeDataArr" @select="consigneeSelect" @change="consigneeChange" + @focus="consigneeChange" /> 保存 保存 @@ -195,6 +199,7 @@ :data-source="truckerDataArr" @select="truckerSelect" @change="truckerChange" + @focus="truckerChange" /> @@ -213,6 +218,7 @@ :data-source="agentidDataArr" @select="agentidSelect" @change="agentidChange" + @focus="agentidChange" /> @@ -298,6 +304,7 @@ :data-source="portloadDataArr" @select="portloadSelect" @change="portloadChange" + @focus="portloadChange" /> @@ -327,6 +334,7 @@ :data-source="transportDataArr" @select="transportSelect" @change="transportChange" + @focus="transportChange" /> @@ -356,6 +364,7 @@ :data-source="portdischargeDataArr" @select="portdischargeSelect" @change="portdischargeChange" + @focus="portdischargeChange" /> @@ -385,6 +394,7 @@ :data-source="destinationDataArr" @select="destinationSelect" @change="destinationChange" + @focus="destinationChange" /> @@ -414,6 +424,7 @@ :data-source="placedeliveryDataArr" @select="placedeliverySelect" @change="placedeliveryChange" + @focus="placedeliveryChange" /> @@ -443,6 +454,7 @@ :data-source="placereceiptDataArr" @select="placereceiptSelect" @change="placereceiptChange" + @focus="placereceiptChange" /> @@ -483,6 +495,7 @@ :data-source="kindpkgsDataArr" @select="kindpkgsSelect" @change="kindpkgsChange" + @focus="kindpkgsChange" /> @@ -666,7 +679,6 @@ export default { watch: { details: { handler(nval, oval) { - // console.log('数据改变', nval) this.$emit('changeDetail', { detail: nval, type: 'mailingInfo' @@ -864,9 +876,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 @@ -956,8 +970,7 @@ export default { // 场站 - start getYardlist(name = '') { GetYardlist({ - Name: name, - keyword: '' + keyword: name }) .then(res => { if (res.code === 200) { @@ -990,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 @@ -1000,7 +1012,7 @@ export default { // 起始港 ( 装货港 / 收货地) - start getPortloadlist(name = '', type) { GetPortloadlist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -1014,6 +1026,10 @@ export default { }, portloadSelect(value) { this.details.portload = value + this.details.issueplace = value + if (!this.details.prepardat) { + this.details.prepardat = value + } const index = this.portloadDataArr.indexOf(value) this.details.portloadid = this.portloadData[index].ediCode }, @@ -1033,7 +1049,7 @@ export default { // 目的港 ( 卸货港 / 中转港 / 目的地 / 交货地) - start getPortlist(name = '', type) { GetPortlist({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -1048,6 +1064,9 @@ export default { // 卸货港 portdischargeSelect(value) { this.details.portdischarge = value + if (!this.details.payableat) { + this.details.payableat = value + } const index = this.portdischargeDataArr.indexOf(value) this.details.portdischargeid = this.portdischargeData[index].ediCode }, @@ -1086,7 +1105,7 @@ export default { // 包装 - start getPackage(name = '') { GetPackage({ - Name: name + KeyWord: name }) .then(res => { if (res.code === 200) { @@ -1115,7 +1134,6 @@ export default { .then(res => { if (res.code === 200) { this[`${type}Data`] = res.data.rows - console.log(this[`${type}DataArr`]) this.$forceUpdate() } }) @@ -1194,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++) { @@ -1208,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 e6b6fff..cdf8535 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() // } @@ -616,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) @@ -705,28 +709,36 @@ 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 { 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) + } }) } }) @@ -806,7 +818,6 @@ export default { this.EDIUloading = false }) .catch(err => { - console.log(err) this.EDISloading = false this.EDIUloading = false }) @@ -838,7 +849,6 @@ export default { title: '温馨提示', content: content, onOk() { - console.log('OK') if (type === 'vgm') { _this.vgmSend() } else if (type === 'paper') { @@ -887,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 { @@ -903,7 +912,6 @@ export default { getSampleBill() { SampleBill(this.id) .then(res => { - console.log('== 样单信息 ==', res.data) if (res.success) { this.initCabinFrom = res.data } else { @@ -919,7 +927,6 @@ export default { getVgmLink() { VgmLink(this.id) .then(res => { - console.log('== VGM信息 ==', res.data) if (res.success) { // this.initCabinFrom = res.data } else { @@ -968,7 +975,6 @@ export default { }, bookingCheckChange(e) { this.bookingModelFrom.useForwarderCode = e.target.checked - console.log(e.target.checked) }, // 放舱 vgm 等保存按钮 @@ -1034,7 +1040,6 @@ export default { this.SaveLoading = false }) .catch(err => { - console.log(err) this.SaveLoading = false }) }, @@ -1051,7 +1056,6 @@ export default { this.SaveLoading = false }) .catch(err => { - console.log(err) this.SaveLoading = false }) }, @@ -1068,7 +1072,6 @@ export default { this.SendLoading = false }) .catch(err => { - console.log(err) this.SendLoading = false }) }, @@ -1077,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) @@ -1106,7 +1108,6 @@ export default { .catch(err => { this.$message.destroy() this.$message.success({ content: '校验失败' }) - console.log(err) }) }, @@ -1301,18 +1302,42 @@ 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: 1px dashed #cdcdcd; + p { + margin: 0; + &:nth-child(2) { + margin-left: 35px; + } + span { + color: #ff6646; + } + } + } + .PrintMainBox { + max-height: 50vh; + overflow-y: auto; + margin-top: 5px; + .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 +1355,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 { diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 0186246..bcf41cf 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -130,7 +130,7 @@
@@ -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) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index caa8d59..ef1bf10 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -256,7 +256,6 @@ export default { this.$message.success('复制成功!') }, init(queryParam = {}) { - console.log(queryParam, 'queryParam') this.gridOptions.pagerConfig = { total: 0, currentPage: 1, @@ -307,7 +306,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 @@ -351,7 +349,6 @@ export default { console.log('表格自定义数据 - 更多： ', this.formMoreTableData) }, handlePageChange({ currentPage, pageSize }) { - console.log(currentPage, pageSize) this.gridOptions.pagerConfig.currentPage = currentPage this.gridOptions.pagerConfig.pageSize = pageSize this.getList(this.formRes) @@ -363,17 +360,14 @@ export default { }, tableRefresh() { let data = { ...this.formRes } - console.log(data, 1) this.init(this.formRes) - console.log(data, 2) this.formRes = data }, tableMoreRefresh() { const arr = this.formRes.MBLNO.split(/-|，|,|[.]/) let val = `` arr.map((item, index) => { - val += `${item} -` + val += `${item}` }) this.moreNumVal = val this.moreNumVisible = !this.moreNumVisible @@ -435,7 +429,6 @@ export default { } else if (form.type === 'select') { // 根据逻辑填写内容 } - console.log(this.formRes) this.$forceUpdate() }, @@ -476,14 +469,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 = {}) { @@ -511,10 +502,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) @@ -625,7 +614,7 @@ export default { diff --git a/src/views/main/Customer/addForm.vue b/src/views/main/Customer/addForm.vue index 3a677a4..a7c5cf5 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; */ + /* border: 1px solid #c9c9c9; */ +} +.CsFormTitle span i{ + margin-right: 7px; } 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 @@