diff --git a/src/router/generator-routers.js b/src/router/generator-routers.js
index 64ca37b..3f1d1df 100644
--- a/src/router/generator-routers.js
+++ b/src/router/generator-routers.js
@@ -26,7 +26,6 @@ const constantRouterComponents = {
// 默认首页
Console: () => import('@/views/system/index/welcome'),
BookingDetail: () => import('@/views/main/BookingLedger/detail'),
- BookingDetailTest: () => import('@/views/main/BookingLedger/detail/indexTest'),
CustomerInformationManagementAdd: () => import('@/views/main/Customer/addForm'),
CustomerInformationManagementEdit: () => import('@/views/main/Customer/editForm'),
SendCarAdd: () => import('@/views/main/SendCar/addForm'),
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 03468ea..41d2184 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -1330,6 +1330,7 @@ export default {
this.$set(newBookingList, res.data.id, res.data)
this.setBookingList(newBookingList)
this.setBookingGridOptions(newBookingGridOptions)
+ that.$store.commit('SET_SAVENEEDNUMBER', null)
that.$router.replace({
name: 'BookingDetail',
query: {
@@ -1361,6 +1362,7 @@ export default {
newBookingGridOptions.data.splice(index, 1, res.data)
this.setBookingList(newBookingList)
this.setBookingGridOptions(newBookingGridOptions)
+ that.$store.commit('SET_SAVENEEDNUMBER', res.data.id)
} else {
that.isCopy = false
that.isAdd = false
@@ -1377,6 +1379,7 @@ export default {
newBookingGridOptions.data.splice(index, 1, res.data)
this.setBookingList(newBookingList)
this.setBookingGridOptions(newBookingGridOptions)
+ that.$store.commit('SET_SAVENEEDNUMBER', res.data.id)
that.$router.replace({
name: 'BookingDetail',
query: {
@@ -1388,7 +1391,6 @@ export default {
})
}
that.setInBookingDetailsSave(false)
- that.$store.commit('SET_SAVENEEDNUMBER', res.data.mblno)
that.$forceUpdate()
} else {
that.setInBookingDetailsSave(false)
diff --git a/src/views/main/BookingLedger/detail/indexTest.vue b/src/views/main/BookingLedger/detail/indexTest.vue
deleted file mode 100644
index 8780a59..0000000
--- a/src/views/main/BookingLedger/detail/indexTest.vue
+++ /dev/null
@@ -1,1765 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/basicInfo.vue b/src/views/main/BookingLedger/detail/modulesTest/basicInfo.vue
deleted file mode 100644
index 7144f11..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/basicInfo.vue
+++ /dev/null
@@ -1,1246 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- W{{ etdWeek || '--' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关闭
-
-
-
-
-
- 新增
- 删除选中
- 保存
-
-
-
-
-
暂无数据
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/billInfo.vue b/src/views/main/BookingLedger/detail/modulesTest/billInfo.vue
deleted file mode 100644
index 09d49c6..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/billInfo.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/cargoInfo.vue b/src/views/main/BookingLedger/detail/modulesTest/cargoInfo.vue
deleted file mode 100644
index 3bc7e7e..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/cargoInfo.vue
+++ /dev/null
@@ -1,868 +0,0 @@
-
-
-
-
- 货物信息
-
-
-
-
-
-
-
-
-
-
Seal No.(封志号)
-
Marks & Nos.(标记与号码)
-
-
-
-
-
-
-
-
-
Description of Goods
-
(包装种类与货名)
-
-
-
- Description of Goods (包装种类与货名)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- C摄氏
- F华氏
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 件数大写:
-
-
-
-
-
-
-
-
-
-
-
-
-
- 总计:{{ pkgstotalRes }}
-
-
-
-
- 总计:{{ kgstotalRes }} / KGS
-
-
-
-
- 总计:{{ cbmtotalRes }} / CBM
-
-
-
- 确定
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/ediMore.vue b/src/views/main/BookingLedger/detail/modulesTest/ediMore.vue
deleted file mode 100644
index c7aceec..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/ediMore.vue
+++ /dev/null
@@ -1,713 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/goodsTable.vue b/src/views/main/BookingLedger/detail/modulesTest/goodsTable.vue
deleted file mode 100644
index 20f88c4..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/goodsTable.vue
+++ /dev/null
@@ -1,1972 +0,0 @@
-
-
-
-
-
-
添加
-
删除
-
- 多品名
-
-
- 引入场站数据
-
-
- 引入场站箱封号
-
-
- 引入箱皮重
-
-
- 展开箱量
-
-
-
-
- 件数: {{ totalPkgs }} {{ tableData.length > 0 ? tableData[0].kindpkgs : "" }}
- 重量: {{ totalKgs }} KGS
- 尺码: {{ totalCbm }} CBM
- 箱量: {{ details.cntrtotal }}
-
-
-
- 加载中 ...
-
-
-
-
-
- 关闭
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/mailingInfo.vue b/src/views/main/BookingLedger/detail/modulesTest/mailingInfo.vue
deleted file mode 100644
index bc8c604..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/mailingInfo.vue
+++ /dev/null
@@ -1,1946 +0,0 @@
-
-
-
-
-
- 收发通信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PIL要求 EDI和ESI报文只允许所有报文中的每个record中的ascii代码,必须小于0x7E,大于等于0x20, 每个Record必须250字节,必填项为数值类型的,不足位数用0补齐。
-
- 1、发货人Rec16,收货人Rec21,通知人Rec26: 公司抬头两行,地址三行,每行35字节;
- 2、第1/2行是公司抬头栏(字段23-92),总共70字节,不足70字节请留空占位;
- 3、第3/4/5行是地址栏(字段93-197),总共105字节,超过105字节,通过星号*链接去rec47品名栏显示;
- 4、极个别情况下,公司抬头可能超过70字节,超出部分放在第三行;
- 5、无论什么情况,报文里地址信息都不放在在第1/2两行,即不占23-92字段。
-
-
-
-
-
发货人
-
-
- 保存
-
-
- *
- 35
- 40
- 50
-
-
-
-
-
-
-
-
-
收货人
-
-
保存
-
- *
- 35
- 40
- 50
-
-
-
-
-
-
-
-
- 收货人复制到通知人
-
-
-
-
- 通知人
- 第二
-
-
-
保存
-
- *
- 35
- 40
- 50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订舱备注
-
-
-
-
-
- 截单备注
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 总计:{{ pkgstotalRes }}
-
-
-
-
- 总计:{{ kgstotalRes }} / KGS
-
-
-
-
- 总计:{{ cbmtotalRes }} / CBM
-
-
-
- 确定
-
-
-
-
-
-
-
-
-
-
-
-
-
第二通知人
-
-
- 保存
-
-
- *
- 35
- 40
- 50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
境外代理
-
-
- 保存
-
-
- *
- 35
- 40
- 50
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/operationArea.vue b/src/views/main/BookingLedger/detail/modulesTest/operationArea.vue
deleted file mode 100644
index 1b806a5..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/operationArea.vue
+++ /dev/null
@@ -1,1500 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 原始
- 更新
- 退舱
-
-
-
-
-
-
- 关闭
- 保存 ESIEDI文件
- 上传 ESIEDI
-
-
-
-
-
-
保存
-
- 删除
-
-
-
- 打印
-
-
-
-
- 发送
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.displayName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ yard.selectShowTab }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ details.mblno || '--' }}
-
-
-
-
- {{ details.hblno || '--' }}
-
-
-
-
- {{ details.voyno || '--' }}
-
-
-
-
- {{ details.etd || '--' }}
-
-
-
-
- {{ details.closingdate || '--' }}
-
-
-
-
- {{ details.closedocdate || '--' }}
-
-
-
-
- {{ details.closevgmdate || '--' }}
-
-
-
-
- {{ details.portload || '--' }}
-
-
-
-
- {{ details.portdischarge || '--' }}
-
-
-
-
- {{ details.destination || '--' }}
-
-
-
-
- {{ details.pkgs || '--' }} / {{ details.kgs || '--' }} / {{ details.cbm || '--' }}
-
-
-
-
-
-
-
-
-
-
-
- 关闭
-
-
-
-
-
-
-
-
-
-
-
-
-
默认打印格式为pdf,如需其他格式请选择
-
- 打印格式:
-
- pdf
- xlsx
- docx
- 精确打印
-
-
-
-
-
-
- ·{{ item.displayName }}
-
-
-
-
-
-
-
-
-
-
-
- 缩放比例:
-
- 100%
- 120%
- 150%
- 200%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订阅
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/preOrder.vue b/src/views/main/BookingLedger/detail/modulesTest/preOrder.vue
deleted file mode 100644
index b47319e..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/preOrder.vue
+++ /dev/null
@@ -1,3108 +0,0 @@
-
-
-
- 取消
-
-
-
-
-
-
- 预配舱单列表
-
-
-
添加分单
-
保存
-
- 删除
-
-
-
发送
-
-
-
-
-
-
-
- {{
- sedDetail.state
- }}
-
- 主提单号:{{ sedDetail.mblno || '请填写主提单号' }}
- 分提单号{{ sindex + 1 }}: {{ sedDetail.hblno || '请填写分单号' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
港口信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
货物信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- C摄氏
- F华氏
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
集装箱信息
-
-
- 新建
-
-
- 复制新建
-
-
- 删除
-
-
-
- 件数: {{ total('pkgs') }} 重量: {{ total('kgs') }} 尺码:{{ total('cbm') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认发送
- 关闭
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/remarksInfo.vue b/src/views/main/BookingLedger/detail/modulesTest/remarksInfo.vue
deleted file mode 100644
index c9cd7bd..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/remarksInfo.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
- 订舱备注
-
-
-
-
-
- 截单备注
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/rightContent.vue b/src/views/main/BookingLedger/detail/modulesTest/rightContent.vue
deleted file mode 100644
index c9ae398..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/rightContent.vue
+++ /dev/null
@@ -1,969 +0,0 @@
-
-
-
- 注意事项
-
-
-
-
-
-
- {{ rule.resultName }}
-
-
-
-
-
-
-
-
-
- 服务项目
-
-
- {{ serive.name }}
-
-
-
-
- 船舶动态
-
-
-
-
-
-
-
-
-
- POL
-
-
-
- ETA:{{ handleTime(details.startETA) }}
-
-
- ATA:{{ handleTime(details.startATA) }}
-
-
-
-
-
-
-
- ETD:{{ handleTime(details.ygtETD) }}
-
-
- ATD:{{ handleTime(details.atd) }}
-
-
-
-
-
-
- POT
-
-
-
- ATA:{{ handleTime(details.middleATA) }}
-
-
- ATD:{{ handleTime(details.middleATD) }}
-
-
-
-
-
-
- POD
-
-
-
- ETA:{{ handleTime(details.eta) }}
-
-
- ATA:{{ handleTime(details.ata) }}
-
-
-
-
-
-
-
-
-
- 货物状态
-
-
-
- 时间:{{ serive.finishTime }}
- 备注:{{ serive.remark }}
- 显示天数:{{ serive.extData }}
-
-
- {{ serive.statusName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 备注
- 新增备注
-
-
-
-
-
-
-
- 附件
-
-
新增附件
-
-
-
-
-
-
-
- {{ file.fileName }}
-
-
-
-
- {{ file.typeName }}
- {{ file.createdUserName }}
- {{ file.createdTime }}
-
-
-
-
-
-
-
- 订单及货运动态
-
-
-
-
- {{ bookingLog.opTime }}
-
-
-
- {{ bookingLog.status }}
-
-
-
- {{ child.opTime }}
-
- {{ child.status }} 箱号:{{ child.cntrno
- }}
-
-
-
-
-
-
-
-
-
-
- 日志
-
-
-
-
-
- {{ log.createdUserName }}
-
- {{ log.createdTime }}
-
-
-
-
-
-
-
-
-
- {{ child.field || '字段' }} :
- {{ child.oldValue }}
-
- 改为:
-
-
- {{ child.field || '字段' }}:
- {{ child.newValue }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
1. 选择上传文件
-
- 选择文件
-
-
支持格式:xls,xlsx,pdf,txt,pms
-
-
-
2. 选择文件类型
-
文件类型:
-
-
- {{ attach.name }}
-
-
-
-
-
-
-
-
- 【脚尖提醒】脚尖提醒脚尖提醒脚尖提醒脚尖提醒
-
-
-
-
- male
-
-
- female
-
-
- 当前状态:新增
-
-
-
-
-
- 2023-04-01 10:05:00
- 2023-04-01 10:05:00
- 2023-04-01 10:05:00
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/sedOperationArea.vue b/src/views/main/BookingLedger/detail/modulesTest/sedOperationArea.vue
deleted file mode 100644
index 24b809d..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/sedOperationArea.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
- 当前分单号: {{ details.hblno }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
默认打印格式为pdf,如需其他格式请选择
-
- 打印格式:
-
- pdf
- xlsx
- docx
- 精确打印
-
-
-
-
-
-
- ·{{ item.displayName }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue b/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue
deleted file mode 100644
index ebc9e38..0000000
--- a/src/views/main/BookingLedger/detail/modulesTest/sedOrder.vue
+++ /dev/null
@@ -1,818 +0,0 @@
-
-
-
-
-
-
-
- 分提单列表收起
-
-
-
-
- 分单{{ sindex + 1 }}: {{ sedDetail.hblno || '请填写分单号' }}
-
-
(未保存)
-
-
-
-
-
添加分单
-
-
-
-
-
-
- 当前分单号: {{ editDetails.hblno }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index f0da440..cd589fa 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -210,7 +210,12 @@
{{ row.ygtETD.substring(0, 10) }}
- {{ row.atd.substring(0, 10) }}
+
+
+
+ {{ row.atd.substring(0, 10) }}
+
+
{{ row.issuedate.substring(0, 10) }}
@@ -790,7 +795,7 @@ import {
downloadDraft,
checkUpdateManifestNo,
singleBCFileRead,
- GetToDoBCList,
+ refreshSailingDate,
RefreshBillTrace
} from '@/api/modular/main/BookingLedger'
@@ -915,6 +920,7 @@ export default {
},
beforeRouteLeave(to, from, next) {
this.setBookingGridOptions(this.gridOptions)
+ this.$store.commit('SET_SAVENEEDNUMBER', null)
next()
},
beforeRouteEnter(to, from, next) {
@@ -927,64 +933,68 @@ export default {
deep: true,
handler(nD, oD) {
if (nD.name === 'booking_ledger') {
- this.getList(this.searchData)
- // PageDataByBooking({ mblno: this.saveNeedNumber }).then(res => {
- // let index = 0
- // const item = res.data.items[0]
- // this.gridOptions.data.forEach((ite, inde) => {
- // if (ite.mblno === this.saveNeedNumber) {
- // index = inde
- // }
- // })
- // const bookstatus = [
- // { staCode: 'sta_cangdan', isChecked: false },
- // { staCode: 'sta_haifang', isChecked: false },
- // { staCode: 'sta_zhuangzai', isChecked: false },
- // { staCode: 'sta_mafang', isChecked: false },
- // { staCode: 'sta_zhuangchuan', isChecked: false },
- // { staCode: 'sta_atd', isChecked: false }
- // ]
- // if (item.bookstatus.length > 0) {
- // bookstatus.map((book, bindex) => {
- // item.bookstatus.map((ite, index) => {
- // if (ite.staCode === book.staCode) {
- // bookstatus[bindex] = ite
- // bookstatus[bindex].isChecked = true
- // }
- // })
- // })
- // }
- // if (item.bsstatusname) {
- // const arr = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
- // if (arr) {
- // let arrColor = ''
- // arr.value.forEach(ite => {
- // if (ite.code == 'booking_goods_status') {
- // arrColor = ite
- // }
- // })
- // if (arrColor) {
- // arrColor.children.forEach(ite => {
- // if (ite.name == item.bsstatusname) {
- // item.bsstatusnameColor = ite.remark
- // }
- // })
- // }
- // }
- // }
- // item.bookstatus = bookstatus
- // item.refshYzitemLoad = false
- // let hasGoods = 0
- // item.goodsStatusList.map((gitem, gindex) => {
- // if (gitem.finishTime || gitem.remark) {
- // hasGoods++
- // }
- // })
- // item.hasGoods = hasGoods
- // this.$set(this.gridOptions.data, index, item)
- // this.$refs.xGrid.reloadData(this.gridOptions.data)
- // console.log(this.gridOptions.data)
- // })
+ if (this.saveNeedNumber !== null) {
+ PageDataByBooking({ id: this.saveNeedNumber }).then(res => {
+ let index = 0
+ const item = res.data.items[0]
+ this.gridOptions.data.forEach((ite, inde) => {
+ if (ite.id === this.saveNeedNumber) {
+ index = inde
+ }
+ })
+ const bookstatus = [
+ { staCode: 'sta_cangdan', isChecked: false },
+ { staCode: 'sta_haifang', isChecked: false },
+ { staCode: 'sta_zhuangzai', isChecked: false },
+ { staCode: 'sta_mafang', isChecked: false },
+ { staCode: 'sta_zhuangchuan', isChecked: false },
+ { staCode: 'sta_atd', isChecked: false }
+ ]
+ if (item.bookstatus.length > 0) {
+ bookstatus.map((book, bindex) => {
+ item.bookstatus.map((ite, index) => {
+ if (ite.staCode === book.staCode) {
+ bookstatus[bindex] = ite
+ bookstatus[bindex].isChecked = true
+ }
+ })
+ })
+ }
+ if (item.bsstatusname) {
+ const arr = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
+ if (arr) {
+ let arrColor = ''
+ arr.value.forEach(ite => {
+ if (ite.code == 'booking_goods_status') {
+ arrColor = ite
+ }
+ })
+ if (arrColor) {
+ arrColor.children.forEach(ite => {
+ if (ite.name == item.bsstatusname) {
+ item.bsstatusnameColor = ite.remark
+ }
+ })
+ }
+ }
+ }
+ item.bookstatus = bookstatus
+ item.refshYzitemLoad = false
+ item.atdLoading = false
+ let hasGoods = 0
+ item.goodsStatusList.map((gitem, gindex) => {
+ if (gitem.finishTime || gitem.remark) {
+ hasGoods++
+ }
+ })
+ item.hasGoods = hasGoods
+ this.$set(this.gridOptions.data, index, item)
+ this.$refs.xGrid.reloadData(this.gridOptions.data)
+ })
+ }
+ if (this.firstFlag && this.saveNeedNumber === null) {
+ this.getList(this.searchData)
+ }
}
}
}
@@ -1754,7 +1764,18 @@ export default {
this.init()
})
},
-
+ handleRefshAtd(row) {
+ row.atdLoading = true
+ this.$forceUpdate()
+ refreshSailingDate({ id: row.id }).then(res => {
+ if (res.success) {
+ row.atdLoading = false
+ } else {
+ this.$message.error(res.message)
+ row.atdLoading = false
+ }
+ })
+ },
formChange(data) {
const { form, value } = data
if (form.type === 'input') {
@@ -1910,6 +1931,7 @@ export default {
}
item.bookstatus = bookstatus
item.refshYzitemLoad = false
+ item.atdLoading = false
let hasGoods = 0
item.goodsStatusList.map((gitem, gindex) => {
if (gitem.finishTime || gitem.remark) {
diff --git a/src/views/main/BookingTemplate/index.vue b/src/views/main/BookingTemplate/index.vue
index a0ccf6a..92e2eff 100644
--- a/src/views/main/BookingTemplate/index.vue
+++ b/src/views/main/BookingTemplate/index.vue
@@ -95,8 +95,8 @@
- 共享所有人
- 取消共享
+ 共享所有人
+ 取消共享
diff --git a/src/views/main/Customer/editForm.vue b/src/views/main/Customer/editForm.vue
index 7aad36c..0bb37c8 100644
--- a/src/views/main/Customer/editForm.vue
+++ b/src/views/main/Customer/editForm.vue
@@ -142,8 +142,8 @@
-
-
+
+
{{ item.name }}
@@ -151,9 +151,10 @@
-
+
-
+
+
+
+
+ {{ item.shortName }}
+
+
+
+
@@ -662,6 +683,7 @@ export default {
ctnList: [],
yardidData: [],
inYardIDData: [],
+ inFactory: [],
yardcontractaData: [],
inYardContactData: [],
payMethodData: [
@@ -791,6 +813,18 @@ export default {
},
mounted() {},
methods: {
+ ChangeFactory(e, option) {
+ this.inFactory.forEach(item => {
+ if (item.id == option.key) {
+ const chief = item.chief ? item.chief : ''
+ const fullNameEN = item.fullNameEN ? item.fullNameEN : ''
+ const addr = item.addr ? item.addr : ''
+ const tel = item.tel ? item.tel : ''
+ this.form.setFieldsValue({ factoryAddr: fullNameEN + addr })
+ this.form.setFieldsValue({ factoryContact: chief + tel })
+ }
+ })
+ },
GetPrintData(cateCode, printType) {
const Data = {
cateCode,
@@ -1106,6 +1140,7 @@ export default {
this.inYardIDData = res.data
this.yardidData = res.data
})
+ this.inFactorySearch()
sysUserQueryUserByPos({ pos: 'PCDD' }).then((res) => {
this.dispatcherIdData = res.data
console.log(this.dispatcherIdData)
@@ -1138,6 +1173,11 @@ export default {
this.inYardIDData = res.data
})
},
+ inFactorySearch(data) {
+ DjyCustomerQuerytDjyCustomerInfo({ queryType: 'factory' }).then((res) => {
+ this.inFactory = res.data
+ })
+ },
ChangeinYardContact(e) {
this.inYardContactData.forEach((item) => {
if (item.id == e) {