diff --git a/src/api/modular/main/bookingprinttemplate.js b/src/api/modular/main/bookingprinttemplate.js new file mode 100644 index 0000000..b32e57a --- /dev/null +++ b/src/api/modular/main/bookingprinttemplate.js @@ -0,0 +1,66 @@ +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) + console.log(parameter) + return axios({ + url: '/BookingPrintTemplate/add', + method: 'post', + data: params, + headers: { 'Content-type': 'multipart/form-data;charset=utf-8' } + }) + // return axios({ + // url: '/sysFileInfo/upload', + // method: 'post', + // data: parameter, + // onUploadProgress: function(progressEvent) { + // let percent = ((progressEvent.loaded / progressEvent.total) * 100) | 0 + // uploadProcess && uploadProcess(percent) + // } + // }) +} + +/** + * 更新订舱打印模板 + * + * @author Myshipping + */ +export function BookingPrintTemplateEdit(parameter) { + return axios({ + url: '/BookingPrintTemplate/edit', + method: 'post', + data: parameter + }) +} + +/** + * 删除订舱模板 + * + * @author Myshipping + */ +export function BookingPrintTemplateDelete(parameter) { + return axios({ + url: '/BookingPrintTemplate/delete', + method: 'post', + data: parameter + }) +} diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue index 738f946..3b3cc1c 100644 --- a/src/views/main/Customer/index.vue +++ b/src/views/main/Customer/index.vue @@ -290,7 +290,7 @@ export default { this.ColumnsQuery.push({ ...item, checked: true }) }) DjyCustomerGet({ type: 'customer_column_config' }).then(res => { - if (JSON.parse(res.data.configJson).length) { + if (res.data && JSON.parse(res.data.configJson).length) { columns.forEach(item => { item.checked = false }) @@ -315,6 +315,8 @@ export default { } }) this.TableColumns = Arr + } else { + this.TableColumns = columns } this.FnGetData() this.$forceUpdate() diff --git a/src/views/main/Printing/addForm.vue b/src/views/main/Printing/addForm.vue new file mode 100644 index 0000000..fee72ea --- /dev/null +++ b/src/views/main/Printing/addForm.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/views/main/Printing/editForm.vue b/src/views/main/Printing/editForm.vue new file mode 100644 index 0000000..ba0dc67 --- /dev/null +++ b/src/views/main/Printing/editForm.vue @@ -0,0 +1,147 @@ + + + diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue new file mode 100644 index 0000000..e4ec2cf --- /dev/null +++ b/src/views/main/Printing/index.vue @@ -0,0 +1,301 @@ + + +