diff --git a/public/index.html b/public/index.html
index 82948c1..0459238 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/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index fd33e4e..ba51f81 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -264,6 +264,7 @@
show-time
format="YYYY-MM-DD HH:mm:ss"
v-model="details.closingdate"
+ @change="closingdateChange"
>
@@ -282,6 +283,7 @@
show-time
format="YYYY-MM-DD HH:mm:ss"
v-model="details.closedocdate"
+ @change="closedocdateChange"
>
@@ -300,6 +302,7 @@
show-time
format="YYYY-MM-DD HH:mm:ss"
v-model="details.closevgmdate"
+ @change="closevgmdateChange"
>
@@ -1589,6 +1592,15 @@ export default {
}
if (a.length == 1 && a.substr(0, 1) != "0") strRet += arr3[a.substr(0, 1)];
return strRet
+ },
+ closingdateChange (date, dateString) {
+ this.details.closingdate = dateString
+ },
+ closevgmdateChange (date, dateString) {
+ this.details.closevgmdate = dateString
+ },
+ closedocdateChange (date, dateString) {
+ this.details.closedocdate = dateString
}
}
}
diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index 2e82fb6..e6e9c97 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -261,6 +261,86 @@
+
+
+
+ {{ details.yard || '--' }}
+
+
+
+
+ {{ details.yardcontract || '--' }}
+
+
+
+
+ {{ details.yardcontracttel || '--' }}
+
+
+
+
+ {{ details.closingdate || '--' }}
+
+
+
+
+ {{ details.closedocdate || '--' }}
+
+
+
+
+ {{ details.closevgmdate || '--' }}
+
+
+
+
@@ -859,6 +939,12 @@ export default {
},
openModel(type) {
// debugger
+ if (['initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
+ if (!this.$route.query.id) {
+ this.$message.error('请保存主单后,进行操作')
+ return false
+ }
+ }
if (['bookingSpace', 'cutOff', 'initCabin', 'ladingBill', 'vgmlink'].includes(type)) {
// 订舱 / 截单
this.modelType = type
@@ -1223,16 +1309,18 @@ export default {
// 保存放舱
saveBookingLetteryard() {
- if (!this.id) {
+ // if (!this.id) {
this.initCabinFrom = {
...this.initCabinFrom,
...{
closeDocTime: this.details.closedocdate,
closingTime: this.details.closingdate,
- vgmTime: this.details.closevgmdate
+ vgmTime: this.details.closevgmdate,
+ yardcontract: this.details.yardcontract,
+ yardcontracttel: this.details.yardcontracttel
}
}
- }
+ // }
SaveBookingLetteryard(this.initCabinFrom)
.then(res => {
if (res.success) {
@@ -1356,7 +1444,7 @@ export default {
fileType = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
}
this.pdfUrl = window.URL.createObjectURL(new Blob([res], { type: `${fileType};charset=utf-8` }))
- const fname = '放舱打印' // 下载文件的名字
+ const fname = `入货通知--${this.details.mblno}` // 下载文件的名字
const link = document.createElement('a')
link.href = this.pdfUrl
link.setAttribute('download', fname)
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index a72ebc1..1d57a92 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -137,7 +137,7 @@
{{ enmuBookingBtn(btn.staCode) }}
{{ enmuBookingBtn(btn.staCode) }}
-
+