diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 779ce16..a721b42 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -82,7 +82,7 @@ @@ -192,6 +193,12 @@ export default { width: '100', dataIndex: 'password' }, + { + title: '发送类型', + align: 'center', + width: '100', + dataIndex: 'sendType' + }, { title: '发送方代码', align: 'center', @@ -289,6 +296,7 @@ export default { // 加载数据方法 必须为 Promise 对象 loadData: [], EdiNameData: [], + SendTypeData: [], CodeData: [] } }, @@ -298,6 +306,7 @@ export default { SysTenantPage().then(res => { this.SysTenantData = res.data.rows }) + this.SendTypeData = this.$options.filters['dictData']('EdiSendType') this.EdiNameData = this.$options.filters['dictData']('edi_type') commondbCarrierlist().then(res => { this.CodeData = res.data @@ -336,6 +345,15 @@ export default { }) return RData }, + FnRSendType(data) { + let RData = '' + this.SendTypeData.forEach(item => { + if (data == item.code) { + RData = item.name + } + }) + return RData + }, toggleAdvanced() { this.advanced = !this.advanced }, diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue index a8b04ff..be62b5b 100644 --- a/src/views/main/Printing/index.vue +++ b/src/views/main/Printing/index.vue @@ -134,10 +134,10 @@ {{ RMain(row) }} - + diff --git a/src/views/main/Taskmanage/TaskmanageDetail/index.vue b/src/views/main/Taskmanage/TaskmanageDetail/index.vue index 192b5f4..0f5e466 100644 --- a/src/views/main/Taskmanage/TaskmanageDetail/index.vue +++ b/src/views/main/Taskmanage/TaskmanageDetail/index.vue @@ -45,7 +45,9 @@
-
发货人
+
+
发货人
+
-
收货人
+
+
收货人
+
-
通知人
+
+
通知人
+
- + @@ -297,7 +303,9 @@ prop="kGs" >
- KGS + KGS
@@ -311,7 +319,9 @@ prop="cbm" >
- CBM + CBM
@@ -320,9 +330,15 @@ prop="siRemark" label="截单备注" :labelCol="labelCol" - :wrapperCol="wrapperCol"> + :wrapperCol="wrapperCol" + > - + @@ -345,9 +361,20 @@
唛头
- +
- + - + @@ -888,25 +1077,63 @@
-
唛头
-
更新
+
+ 唛头 +
+
+ 更新 +
- +
- +
-
货物描述
-
更新
+
+ 货物描述 +
+
+ 更新 +
- +
- + { - if (res.success) { - res.data.contaList.map((item, index) => { - item.seq = index - }) - this.taskDetail = res.data - } else { - this.$message.error(res.message) - } - }).catch(err => { - console.log(err) }) + .then(res => { + if (res.success) { + res.data.contaList.map((item, index) => { + item.seq = index + }) + this.taskDetail = res.data + } else { + this.$message.error(res.message) + } + }) + .catch(err => { + console.log(err) + }) }, - getSIFeedBackInfo () { + getSIFeedBackInfo() { GetSIFeedBackInfo({ taskPKId: this.taskPKId - }).then(res => { - if (res.success) { - const _data = { ...res.data.bookingOrder, ...res.data.busiInfo } - _data.contaList.map((item, index) => { - item.seq = index - }) - this.taskSiDetail = _data - console.log('si信息', res) - this.siCompareOrderKeyList = res.data.siCompareOrderKeyList - } else { - this.$message.error(res.message) - } - }).catch(err => { - console.log(err) }) + .then(res => { + if (res.success) { + const _data = { ...res.data.bookingOrder, ...res.data.busiInfo } + _data.contaList.map((item, index) => { + item.seq = index + }) + this.taskSiDetail = _data + console.log('si信息', res) + this.siCompareOrderKeyList = res.data.siCompareOrderKeyList + } else { + this.$message.error(res.message) + } + }) + .catch(err => { + console.log(err) + }) }, // 起始港 ( 装货港 / 收货地) - start @@ -1595,7 +1879,7 @@ export default { textareaChange(e, type) { this.taskDetail[type] = e.target.value }, - valueChange (type) { + valueChange(type) { if (type === 'marks') { this.taskDetail.marks = this.ToCDB(this.taskDetail.marks).toUpperCase() console.log(this.taskDetail.marks) @@ -1605,13 +1889,12 @@ export default { } }, ToCDB(str) { - var tmp = ''; + var tmp = '' for (var i = 0; i < str.length; i++) { if (str.charCodeAt(i) > 65248 && str.charCodeAt(i) < 65375) { - tmp += String.fromCharCode(str.charCodeAt(i) - 65248); - } - else { - tmp += String.fromCharCode(str.charCodeAt(i)); + tmp += String.fromCharCode(str.charCodeAt(i) - 65248) + } else { + tmp += String.fromCharCode(str.charCodeAt(i)) } } return tmp @@ -1704,7 +1987,7 @@ export default { this.getService(value) }, // 运输条款 - end - closedocdateChange (date, dateString) { + closedocdateChange(date, dateString) { this.taskDetail.closeDocDate = dateString }, changeDetailFun(data) { @@ -1732,13 +2015,13 @@ export default { this.taskDetail.cbm = val || this.taskDetail.cbm } }, - reloadFun (type) { + reloadFun(type) { console.log('type = ', type) this.taskDetail[type] = this.taskSiDetail[type] this.siCompareOrderKeyList.splice(this.siCompareOrderKeyList.indexOf(type.toUpperCase()), 1) this.$forceUpdate() }, - reloadboxFun (type, index) { + reloadboxFun(type, index) { console.log(index) let data = this.taskDetail[type] data[index] = this.taskSiDetail[type][index] @@ -1748,14 +2031,38 @@ export default { this.$set(this.taskDetail, type, []) setTimeout(() => { this.$set(this.taskDetail, type, data) - },300) + }, 300) // this.taskDetail[type][index] = {} // this.taskDetail[type][index] = this.taskSiDetail[type][index] console.log(this.taskDetail[type]) this.$forceUpdate() }, - reloadSiAll () { - const arr = ['shipper', 'consigne', 'notifyParty', 'portLoadId', 'portLoad', 'transportId', 'transport', 'portDischargeId', 'portDischarge', 'destinationId', 'destination', 'pkGs', 'kindPKGs', 'kGs', 'cbm', 'siRemark', 'marks', 'description', 'issueType', 'blfrt', 'thirdPayAddr', 'service', 'closeDocDate'] + reloadSiAll() { + const arr = [ + 'shipper', + 'consigne', + 'notifyParty', + 'portLoadId', + 'portLoad', + 'transportId', + 'transport', + 'portDischargeId', + 'portDischarge', + 'destinationId', + 'destination', + 'pkGs', + 'kindPKGs', + 'kGs', + 'cbm', + 'siRemark', + 'marks', + 'description', + 'issueType', + 'blfrt', + 'thirdPayAddr', + 'service', + 'closeDocDate' + ] arr.map((item, index) => { this.reloadFun(item) }) @@ -1770,36 +2077,40 @@ export default { // this.taskDetail = JSON.parse(JSON.stringify(this.taskSiDetail)) }, // 完成任务 - completeTaskFun () { + completeTaskFun() { CompleteTask({ - PKIds: [this.taskPKId], - }).then((res) => { - if (res.success) { - this.$message.success('已完成任务') - } else { - this.$message.error(res.message) - } - }).catch((err) => { - console.log(err) + PKIds: [this.taskPKId] }) + .then(res => { + if (res.success) { + this.$message.success('已完成任务') + } else { + this.$message.error(res.message) + } + }) + .catch(err => { + console.log(err) + }) }, // 取消 - cancelTaskFun () { + cancelTaskFun() { CancelTask({ PKIds: [this.taskPKId] - }).then((res) => { - if (res.success) { - this.$message.success('取消任务成功') - } else { - this.$message.error(res.message) - } - }).catch((err) => { - console.log(err) }) + .then(res => { + if (res.success) { + this.$message.success('取消任务成功') + } else { + this.$message.error(res.message) + } + }) + .catch(err => { + console.log(err) + }) }, // 发送SI - cutOffFun () { - this.bookingModelvisible = true + cutOffFun() { + this.bookingModelvisible = true }, bookingCheckChange(e) { this.bookingModelFrom.useForwarderCode = e.target.checked @@ -1840,120 +2151,122 @@ export default { console.log('== 接口报错 ==', this.bookingModelFrom) debugger DownloadClosingEDI(this.bookingModelFrom) - .then(res => { - this.EDISloading = false - this.EDIUloading = false - if (res.message) { - // this.$message.error(res.message) - const h = this.$createElement - this.$message.error({ - content: () => - h( - 'span', - { - style: { - whiteSpace: 'pre-wrap' - } - }, - res.message - ) - }) - return false - } else { - const pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'text/plain;charset=utf-8' })) - const fname = `${this.taskDetail.mblno} - 保存EDI` // 下载文件的名字 - const link = document.createElement('a') - link.href = pdfUrl - link.setAttribute('download', fname) - document.body.appendChild(link) - link.click() - this.handleModelCancel() - } - }) - .catch(() => { - this.EDISloading = false - this.EDIUloading = false - }) + .then(res => { + this.EDISloading = false + this.EDIUloading = false + if (res.message) { + // this.$message.error(res.message) + const h = this.$createElement + this.$message.error({ + content: () => + h( + 'span', + { + style: { + whiteSpace: 'pre-wrap' + } + }, + res.message + ) + }) + return false + } else { + const pdfUrl = window.URL.createObjectURL(new Blob([res], { type: 'text/plain;charset=utf-8' })) + const fname = `${this.taskDetail.mblno} - 保存EDI` // 下载文件的名字 + const link = document.createElement('a') + link.href = pdfUrl + link.setAttribute('download', fname) + document.body.appendChild(link) + link.click() + this.handleModelCancel() + } + }) + .catch(() => { + this.EDISloading = false + this.EDIUloading = false + }) }, sendBookingOrEDI(type) { console.log('== 需要换接口 ==', this.bookingModelFrom) SendClosingEDI(this.bookingModelFrom) - .then(res => { - this.EDISloading = false - this.EDIUloading = false - // 未完成 - if (res.success) { - this.$message.success({ - content: '发送成功', - duration: 0 - }) - this.handleModelCancel() - } else { - const h = this.$createElement - this.$message.error({ - content: () => - h( - 'span', - { - style: { - whiteSpace: 'pre-wrap' - } - }, - res.message - ) - }) - // this.$message.error(res.message) - } - }) - .catch(() => { - this.EDISloading = false - this.EDIUloading = false - }) + .then(res => { + this.EDISloading = false + this.EDIUloading = false + // 未完成 + if (res.success) { + this.$message.success({ + content: '发送成功', + duration: 0 + }) + this.handleModelCancel() + } else { + const h = this.$createElement + this.$message.error({ + content: () => + h( + 'span', + { + style: { + whiteSpace: 'pre-wrap' + } + }, + res.message + ) + }) + // this.$message.error(res.message) + } + }) + .catch(() => { + this.EDISloading = false + this.EDIUloading = false + }) }, - saveFun () { + saveFun() { debugger // 接口报错 ， id不传 - SaveBookingSI(this.taskDetail).then((res) => { - if (res.success) { - this.$message.success('保存成功') - } else { - this.$message.error(res.message) - } - }).catch((err) => { - console.log(err) - }) + SaveBookingSI(this.taskDetail) + .then(res => { + if (res.success) { + this.$message.success('保存成功') + } else { + this.$message.error(res.message) + } + }) + .catch(err => { + console.log(err) + }) }, - compareOrder () { + compareOrder() { this.openCompareOrder = !this.openCompareOrder } - }, + } }