diff --git a/src/api/modular/main/bookingprinttemplateNew.js b/src/api/modular/main/bookingprinttemplateNew.js
new file mode 100644
index 0000000..0e88b18
--- /dev/null
+++ b/src/api/modular/main/bookingprinttemplateNew.js
@@ -0,0 +1,138 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 分页查询订舱打印模板
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplatePage(parameter) {
+ return axios({
+ url: '/BookingPrintTemplate/page',
+ method: 'get',
+ params: parameter
+ })
+}
+
+/**
+ * 增加订舱打印模板
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateAdd(parameter) {
+ let params = new FormData()
+ params.append('file', parameter.file)
+ Object.keys(parameter.data).forEach(item => {
+ params.append(`${item}`, parameter.data[item])
+ })
+ console.log(parameter)
+ return axios({
+ url: '/BookingPrintTemplate/add',
+ method: 'post',
+ data: params,
+ headers: { 'Content-type': 'multipart/form-data;charset=utf-8' }
+ })
+}
+/**
+ * 保存订舱打印模板(新增或修改)
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateSave(parameter) {
+ let params = new FormData()
+ params.append('file', parameter.file)
+ Object.keys(parameter.data).forEach(item => {
+ params.append(`${item}`, parameter.data[item])
+ })
+ console.log(parameter)
+ return axios({
+ url: '/BookingPrintTemplate/save',
+ method: 'post',
+ data: params,
+ headers: { 'Content-type': 'multipart/form-data;charset=utf-8' }
+ })
+}
+/**
+ * 更新订舱打印模板
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateEdit(parameter) {
+ let params = new FormData()
+ params.append('file', parameter.file)
+ Object.keys(parameter.data).forEach(item => {
+ params.append(`${item}`, parameter.data[item])
+ })
+ console.log(parameter)
+ return axios({
+ url: '/BookingPrintTemplate/edit',
+ method: 'post',
+ data: params,
+ headers: { 'Content-type': 'multipart/form-data;charset=utf-8' }
+ })
+}
+
+/**
+ * 删除订舱模板
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateDelete(parameter) {
+ return axios({
+ url: '/BookingPrintTemplate/delete',
+ method: 'post',
+ data: parameter
+ })
+}
+/**
+ * 新增编辑excel模板
+ *
+ * @author Myshipping
+ */
+export function BookingTemplateAddOrUpdateExcelTemplate(parameter) {
+ return axios({
+ url: '/BookingTemplate/AddOrUpdateExcelTemplate',
+ method: 'post',
+ data: parameter
+ })
+}
+/**
+ * 获取excel模板详情
+ *
+ * @author Myshipping
+ */
+export function BookingTemplateBookingExcelTemplateList(parameter) {
+ return axios({
+ url: '/BookingTemplate/BookingExcelTemplateList',
+ method: 'get',
+ data: parameter
+ })
+}
+
+/**
+ * 分页查询租户
+ *
+ * @author Myshipping
+ */
+export function SysTenantPage(parameter) {
+ return axios({
+ url: '/sysTenant/page',
+ method: 'get',
+ params: {
+ pageNo: 1,
+ pageSize: 999999,
+ ...parameter
+ }
+ })
+}
+/**
+ * 下载模板文件
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateDownload(parameter) {
+ return axios({
+ url: '/BookingPrintTemplate/download',
+ method: 'get',
+ params: parameter
+ })
+}
diff --git a/src/views/main/PrintingNew/addForm.vue b/src/views/main/PrintingNew/addForm.vue
new file mode 100644
index 0000000..e3d31c5
--- /dev/null
+++ b/src/views/main/PrintingNew/addForm.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FastReport
+
+
+ Excel模板
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 文件上传
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/main/PrintingNew/editForm.vue b/src/views/main/PrintingNew/editForm.vue
new file mode 100644
index 0000000..f0e7bbc
--- /dev/null
+++ b/src/views/main/PrintingNew/editForm.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FastReport
+
+
+ Excel模板
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 文件上传
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/main/PrintingNew/index.vue b/src/views/main/PrintingNew/index.vue
new file mode 100644
index 0000000..b506d66
--- /dev/null
+++ b/src/views/main/PrintingNew/index.vue
@@ -0,0 +1,460 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ FastReport
+
+
+ Excel模板
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 设置
+
+
+
+
+
+
+
+
+
+
+ 新增订舱打印模板
+
+
+
+
+
+
+
+
+
+
+ {{ row.fileName }}
+
+
+
+
+ {{ row.cateName }}
+
+
+
+
+ {{ RMain(row) }}
+
+
+
+
+ 编辑
+ 详细设置
+ {
+ confirm(e, row)
+ }
+ "
+ >
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加一行
+ 删除选中
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/main/vesselinfo/addForm.vue b/src/views/main/vesselinfo/addForm.vue
index c4defd3..c40a04b 100644
--- a/src/views/main/vesselinfo/addForm.vue
+++ b/src/views/main/vesselinfo/addForm.vue
@@ -83,6 +83,48 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-