From c78c0beafc73057d4224c9940010c36397e487ee Mon Sep 17 00:00:00 2001 From: lilu Date: Mon, 27 Mar 2023 17:09:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=20+=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E3=80=81=E5=8D=95=E8=AF=81=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/index.vue | 13 ++ .../detail/modules/basicInfo.vue | 36 ++++ .../BookingLedger/detail/modules/sedOrder.vue | 168 ++++++++++++++++++ src/views/main/BookingLedger/detail/rules.js | 6 +- .../BookingLedger/detail/style/basicInfo.less | 6 + src/views/main/BookingLedger/list/index.vue | 5 +- .../BookingLedger/list/modules/initData.js | 19 +- 7 files changed, 243 insertions(+), 10 deletions(-) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index a7306ab..0cb59b6 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -199,6 +199,9 @@ const initDetail = { custserviceid: '', route: '', routeid: '', + // 添加单证备注,操作备注 + dzRemark: '', + czRemark: '', // 收发通信息 shipper: '', feeself: false, @@ -449,6 +452,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 切路由设置数据 1. ==', hisData) this.$set(this.historyData, `copy-${this.id}`, hisData) } else if (this.$route.query.addNum) { const hisData = { @@ -466,6 +470,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 切路由设置数据 2. ==', hisData) this.$set(this.historyData, `add-${this.$route.query.addNum}`, hisData) } else { const hisData = { @@ -483,6 +488,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 切路由设置数据 3. ==', hisData) this.$set(this.historyData, this.id, hisData) } next() @@ -508,6 +514,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 离开路由设置数据 1. ==', hisData) this.$set(this.historyData, `copy-${this.id}`, hisData) } else if (this.$route.query.addNum) { const hisData = { @@ -525,6 +532,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 离开路由设置数据 2. ==', hisData) this.$set(this.historyData, `add-${this.$route.query.addNum}`, hisData) } else { const hisData = { @@ -542,6 +550,7 @@ export default { const secActive = this.$refs.sedOrder.$data.editIndex hisData.secActive = secActive } + console.log('== 离开路由设置数据 3. ==', hisData) this.$set(this.historyData, this.id, hisData) } if (this.hasbookingDetail) { @@ -574,6 +583,7 @@ export default { this.isCopy = this.$route.query.isCopy this.inPageLoading = false setTimeout(() => { + console.log('== 1. 获取切换数据 ==', this.bookingDetails.hbList.length) if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { this.Showtabs = true if (this.tabActiveKey === '2') { @@ -608,6 +618,7 @@ export default { this.bookingDetails.mblno = '' } setTimeout(() => { + console.log('== 2. 获取切换数据 ==', this.bookingDetails.hbList.length) if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { this.Showtabs = true if (this.tabActiveKey === '2') { @@ -637,6 +648,7 @@ export default { this.isCopy = this.$route.query.isCopy this.inPageLoading = false setTimeout(() => { + console.log('== 3. 获取切换数据 ==', this.bookingDetails.hbList.length) if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) { this.Showtabs = true if (this.tabActiveKey === '2') { @@ -665,6 +677,7 @@ export default { this.mainOrderActiveKey = '1-1' this.$forceUpdate() this.init() + console.log('== 4. 新建 ==') setTimeout(() => { // console.log('== 4. 设置主单保存数据 - false ==') this.checkSaveFun({ type: 'details', hasChange: false }) diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index d3901a0..a6185b1 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -473,6 +473,32 @@ + + + + + + + + + + + + @@ -596,6 +622,16 @@ export default { sm: { span: 15 }, md: { span: 16 } }, + labelCol3: { + xs: { span: 24 }, + sm: { span: 5 }, + md: { span: 5 } + }, + wrapperCol3: { + xs: { span: 24 }, + sm: { span: 19 }, + md: { span: 19 } + }, form: this.$form.createForm(this), // 选择委托单位 / 关系人弹窗 - start customerType: '', diff --git a/src/views/main/BookingLedger/detail/modules/sedOrder.vue b/src/views/main/BookingLedger/detail/modules/sedOrder.vue index c1e93fe..bd3240d 100644 --- a/src/views/main/BookingLedger/detail/modules/sedOrder.vue +++ b/src/views/main/BookingLedger/detail/modules/sedOrder.vue @@ -156,6 +156,172 @@ import goodsTable from './goodsTable' import ediMore from './ediMore' import rules from '../rules' import { BookingOrderSave, DeleteBookingOrder } from '@/api/modular/main/BookingLedger' +const sedDetail = { + id: 0, + parentId: 0, + // 基本信息 + customername: '', + customerid: '', + carrier: 'CMA', + carrierid: 'CMA', + forwarder: '', + forwarderid: '', + pono: '', + mblno: '', + hblno: '', + EPCode: '', // esl下的EP号 + custno: '', + contractno: '', + vessel: '', + voyno: '', + voynoinner: '', + lanecode: '', + etd: '', + atd: '', + lanename: '', + shipagency: '', + shipagencyid: '', + lineName: '', + sale: '', + saleid: '', + op: '', + opid: '', + doc: '', + docid: '', + custservice: '', + custserviceid: '', + route: '', + routeid: '', + // 添加单证备注,操作备注 + dzRemark: '', + czRemark: '', + // 收发通信息 + shipper: '', + feeself: false, + consignee: '', + notifyparty: '', + yard: '', + yardid: '', + customser: '', + customserid: '', + trucker: '', + truckerid: '', + agentname: '', + agentid: '', + warehouse: '', + warehouseID: '', + eta: '', + closingdate: '', + closedocdate: '', + closevgmdate: '', + portload: '', + portloadid: '', + transport: '', + transportid: '', + portdischarge: '', + portdischargeid: '', + destination: '', + destinationid: '', + placedelivery: '', + placedeliveryid: '', + placereceipt: '', + placereceiptid: '', + pkgs: 0, + kindpkgs: '', + kgs: 0, + cbm: 0, + yardremark: '', + yardcontract: '', + yardcontracttel: '', + yardcontractemail: '', + pkgstotal: '', + kgstotal: '', + cbmtotal: '', + // 货物信息 + marks: '', + goodsname: '', + goodscode: '', + cargoid: '', + hscode: '', + description: '', + totalno: '', + // 签单信息 + issuetype: '', + issuedate: '', + issueplace: '', + issueplaceid: '', + nobill: 'THREE', + copynobill: 'THREE', + prepardat: '', + prepardatid: '', + payableat: '', + payableatid: '', + blfrt: '', + thirdpayaddr: '', + service: 'CY-CY', + reeferf: '', + tempset: '', + tempid: '', + tempmin: '', + tempmax: '', + humidity: '', + dclass: '', + dunno: '', + dpage: '', + dlabel: '', + linkman: '', + // 备注信息 + soremark: '', + siremark: '', + // 箱型 + ctnInputs: [], + // edi补充信息 (edi联系人等暂无字段) + weituo: '', + freightpayer: '', + scaccode: '', + itncode: '', + iscontainersoc: 0, + bookingEDIExt: { + weiTuoFang: '', + ediAttn: '', + ediAttnTel: '', + ediAttnMail: '', + sendCode: '', + receiveCode: '', + amsConsignee: '', + amsNotifyParty: '', + opEName: '', + opTel: '', + opEmail: '', + goodsName: '', + orderRemark: '', + kingTareweight: '', + exRemark1: '', + exRemark2: '', + exRemark3: '', + exRemark4: '', + // == 以下为太平 == + consigneeEdiCode: '', + shipperEdiCode: '', + notifyCdoe: '', + salerCode: '', + emanifestHbl: '', + masterBolIndicator: '', + s0CC0C: '', + ckhi: '', + cncm: '', + wncm: '', + acihbl: '' + }, + // 分单信息未添加 + hbList: [], + // 新增右侧内容 + remark: [], + file: [], + log: [], + item: [], + statuslog: [] +} export default { name: 'SedOrder', props: { @@ -260,6 +426,7 @@ export default { }, methods: { init(data = {}) { + console.log('= 创建分单 =') this.inSecLoad = true if (Object.keys(data).length > 0) { this.sedOrderList = JSON.parse(JSON.stringify(data)) @@ -281,6 +448,7 @@ export default { } } this.editDetails = data + console.log('== 创建分单 - init 结束 ==', this.editDetails) setTimeout(() => { this.$refs.goodsTable.init() }, 1000) diff --git a/src/views/main/BookingLedger/detail/rules.js b/src/views/main/BookingLedger/detail/rules.js index b85f221..2fb513b 100644 --- a/src/views/main/BookingLedger/detail/rules.js +++ b/src/views/main/BookingLedger/detail/rules.js @@ -22,7 +22,9 @@ export default { op: [{ required: false, message: '请选择操作人员', trigger: 'change' }], doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }], custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }], - route: [{ required: false, message: '请选择航线操作', trigger: 'change' }] + route: [{ required: false, message: '请选择航线操作', trigger: 'change' }], + dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }], + czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }] }, mailingRules: { shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }], @@ -88,7 +90,7 @@ export default { }, remarksRules: { soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }], - siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }] + siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }], }, ediRules: { 'bookingEDIExt.sendCode': [{ required: false, message: '请输入发送方EDI代码', trigger: 'change' }], diff --git a/src/views/main/BookingLedger/detail/style/basicInfo.less b/src/views/main/BookingLedger/detail/style/basicInfo.less index 6f7bce0..c88ab61 100644 --- a/src/views/main/BookingLedger/detail/style/basicInfo.less +++ b/src/views/main/BookingLedger/detail/style/basicInfo.less @@ -20,6 +20,12 @@ /*margin-top: 20px;*/ padding-top: 0; } + + .from-box4 { + border-top: 1px dashed #ccc; + margin-top: 8px; + padding-top: 0; + } .date-box { display: flex; diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 15402fd..a728ef5 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -628,7 +628,10 @@ export default { columns: JSON.parse(JSON.stringify(initData.columns)), data: [] } - next() + console.log('== 设置，清空了列表数据 ==') + next(vm => { + console.log('== 开始跳转 ==') + }) }, beforeRouteEnter (to, from, next) { next(vm => { diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js index 2067e5d..c1d54e5 100644 --- a/src/views/main/BookingLedger/list/modules/initData.js +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -48,7 +48,7 @@ export default { { field: 'placedelivery', label: 'PLACEDELIVERY', width: 120, title: '交货地点', showHeaderOverflow: true, sortable: true }, { field: 'nobill', label: 'NOBILL', width: 120, title: '提单份数', showHeaderOverflow: true, sortable: true }, { field: 'portdischarge', label: 'PORTDISCHARGE', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true }, - { field: 'bookremark', label: 'BOOKREMARK', width: 120, title: '合同号备注', className: 'book-remark-box', showOverflow: false, slots: { default: 'bookremark' } }, + { field: 'bookremark', label: 'BOOKREMARK', width: 120, title: '备注', className: 'book-remark-box', showOverflow: false, slots: { default: 'bookremark' } }, // 标题 合同号备注 改为 备注 // { field: 'remarks', label: 'REMARKS', width: 120, title: '其他备注', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'remarks' } }, // 暂时写为so备注 + si备注 数据量太大，不要了 { field: 'bookstatus', label: 'BOOKSTATUS', minWidth: 140, title: '运踪', showHeaderOverflow: true, slots: { default: 'bookstatus' } }, { field: 'closingdate', label: 'CLOSINGDATE', width: 160, title: '截港日期', showHeaderOverflow: true, sortable: true, slots: { default: 'closingdate' } }, @@ -61,7 +61,7 @@ export default { { field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true }, { field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售 { field: 'lanename', label: 'LANENAME', width: 160, title: '航线', showHeaderOverflow: true, sortable: true }, - { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 + // { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉 { field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true }, { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true }, { field: 'agentid', label: 'AGENTID', width: 160, title: '国外代理', showHeaderOverflow: true, sortable: true }, @@ -98,7 +98,10 @@ export default { { field: 'placedeliveryid', label: 'PLACEDELIVERYID', width: 120, title: '交货地代码', showHeaderOverflow: true, sortable: true }, { field: 'portloadid', label: 'PORTLOADID', width: 120, title: '装货港代码', showHeaderOverflow: true, sortable: true }, { field: 'portdischargeid', label: 'PORTDISCHARGEID', width: 120, title: '卸货港代码', showHeaderOverflow: true, sortable: true }, - { field: 'pono', label: 'pono', width: 120, title: 'PO NO', showHeaderOverflow: true, sortable: true } + { field: 'pono', label: 'PONO', width: 120, title: 'PO NO', showHeaderOverflow: true, sortable: true }, + // 以下为新增字段 + { field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true }, + { field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true } ], // ==== 表单部分 ==== condAllData: [ @@ -123,7 +126,7 @@ export default { { title: '订舱编号', align: 'center', width: 120, label: 'CUSTNO', type: 'input' }, { title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' }, { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'input' }, - { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, + // { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉 { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' }, { title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' }, { title: '海关航次', align: 'center', width: 120, label: 'VOYNO', type: 'input' }, @@ -150,7 +153,7 @@ export default { { title: '装货港代码', align: 'center', width: 120, label: 'PORTLOADID', type: 'input' }, { title: '卸货港代码', align: 'center', width: 120, label: 'PORTDISCHARGEID', type: 'input' }, { title: '航线操作', align: 'center', width: 120, label: 'ROUTE', type: 'complete', showLabel: 'name' }, - { title: 'PO NO', align: 'center', width: 120, label: 'pono', type: 'input' }, + { title: 'PO NO', align: 'center', width: 120, label: 'PONO', type: 'input' }, // 新增字段 { title: '件数', align: 'center', width: 160, label: 'PKGS', type: 'input' }, @@ -218,7 +221,9 @@ export default { ] }, - // 以下为日期区间 - { title: '签单日期', align: 'center', width: 160, label: 'ISSUEDATE', type: 'dateRange', resLabel: ['BISSUEDATE', 'EISSUEDATE'] } + { title: '签单日期', align: 'center', width: 160, label: 'ISSUEDATE', type: 'dateRange', resLabel: ['BISSUEDATE', 'EISSUEDATE'] }, + // 以下为新增字段 - 台账文档中, 参数暂无 + // { title: '单证备注', align: 'center', width: 160, label: 'DZREMARK', type: 'input' }, + // { title: '操作备注', align: 'center', width: 160, label: 'CZREMARK', type: 'input' } ] } From 5289a02eab282455bacb7b8a37179279a95ae5ce Mon Sep 17 00:00:00 2001 From: lilu Date: Tue, 28 Mar 2023 09:35:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=90=8D?= =?UTF-8?q?=EF=BC=8Cedi=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E6=94=BE?= =?UTF-8?q?=E8=88=B1=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/components/selectView.vue | 19 ++++++- src/views/main/BookingLedger/detail/index.vue | 12 ++-- .../detail/modules/cargoInfo.vue | 3 +- .../BookingLedger/detail/modules/ediMore.vue | 57 ++++++++++++++----- .../detail/modules/operationArea.vue | 4 +- 5 files changed, 72 insertions(+), 23 deletions(-) diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index 471b230..de1f761 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/src/views/main/BookingLedger/detail/components/selectView.vue @@ -295,6 +295,23 @@ export default { code: 'TEN' } ] + case 'masterBolIndicator': + return [ + { ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' }, + { ID: '2', NAME: 'Self filing HBL | 自己发' }, + { ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' } + ] + case 'salerCode': + return [ + { ID: 'CN087', NAME: 'CN087 | GRACE SUN' }, + { ID: 'CN096', NAME: 'CN096 | LEON LIANG' }, + { ID: 'CN097', NAME: 'CN097 | CHARLES GAO' }, + { ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' }, + { ID: 'CN106', NAME: 'CN106 | HOKI YU' }, + { ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' }, + { ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' }, + { ID: 'CN100', NAME: 'CN100 | LEOREN' } + ] case 'yard': return this.yardList case 'kindpkgs': @@ -360,7 +377,7 @@ export default { this.$refs.selectView.$refs.vcSelect.focus() } this.open = true - if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'lineName'].includes(this.type)) { + if (['cargoid', 'nobill', 'copynobill', 'carrierid', 'yard', 'kindpkgs', 'issuetype', 'blfrt', 'lineName', 'masterBolIndicator', 'salerCode'].includes(this.type)) { this.selectList = this.emnuData(this.type) this.inLoading = false return false diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 0cb59b6..01a9256 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -311,9 +311,11 @@ const initDetail = { consigneeEdiCode: '', shipperEdiCode: '', notifyCdoe: '', - salerCode: '', + salerCode: 'CN087', + salerCodeName: 'GRACE SUN', emanifestHbl: '', - masterBolIndicator: '', + masterBolIndicator: '3', + masterBolIndicatorName: 'Not Applicable/Straight bl | 无HBL', s0CC0C: '', ckhi: '', cncm: '', @@ -352,9 +354,11 @@ const bookingEDIExt = { consigneeEdiCode: '', shipperEdiCode: '', notifyCdoe: '', - salerCode: '', + salerCode: 'CN087', + salerCodeName: 'GRACE SUN', emanifestHbl: '', - masterBolIndicator: '', + masterBolIndicator: '3', + masterBolIndicatorName: 'Not Applicable/Straight bl | 无HBL', s0CC0C: '', ckhi: '', cncm: '', diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue index dc9fd06..d8db7a2 100644 --- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue @@ -44,12 +44,13 @@
Description of Goods (包装种类与货名)
+ - + + @@ -352,11 +361,20 @@ has-feedback prop="bookingEDIExt.masterBolIndicator" > - + + @@ -430,10 +448,12 @@