From d5baf6a0b2f6d2858c2631fc09bba0486af42bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Fri, 4 Nov 2022 17:01:10 +0800 Subject: [PATCH] 11/04 --- src/api/modular/main/bookingprinttemplate.js | 27 ++++++++++++------ src/views/main/Customer/index.vue | 29 +++++++++++++------- src/views/main/Printing/addForm.vue | 11 ++++++-- src/views/main/Printing/index.vue | 9 ++++-- 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/src/api/modular/main/bookingprinttemplate.js b/src/api/modular/main/bookingprinttemplate.js index b32e57a..e1fa829 100644 --- a/src/api/modular/main/bookingprinttemplate.js +++ b/src/api/modular/main/bookingprinttemplate.js @@ -21,6 +21,9 @@ export function BookingPrintTemplatePage(parameter) { 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', @@ -28,15 +31,6 @@ export function BookingPrintTemplateAdd(parameter) { 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) - // } - // }) } /** @@ -64,3 +58,18 @@ export function BookingPrintTemplateDelete(parameter) { data: parameter }) } +/** + * 分页查询租户 + * + * @author Myshipping + */ +export function SysTenantPage() { + return axios({ + url: '/sysTenant/page', + method: 'get', + params: { + pageNo: 1, + pageSize: 999999 + } + }) +} diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue index 3b3cc1c..b5c5a21 100644 --- a/src/views/main/Customer/index.vue +++ b/src/views/main/Customer/index.vue @@ -17,22 +17,24 @@ - + - - - 设置 - 查询 重置 - + {{ advanced ? '收起' : '展开' }} + + + + 设置 + + @@ -61,7 +63,7 @@ v-for="item in TableColumns" :key="`${item.dataIndex}3`" :field="item.dataIndex" - :width="item.width" + :min-width="item.width" :title="item.title" :align="item.align" v-if="item.checked" @@ -236,7 +238,8 @@ export default { TableColumns: [], tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' }, // 加载数据方法 必须为 Promise 对象 - loadData: {} + loadData: {}, + ColumnsQueryL: 0 } }, created() {}, @@ -252,6 +255,7 @@ export default { Data.push(item.dataIndex) } }) + this.ColumnsQueryL = Data.length DjyUserConfigAdd({ type: 'customer_cond_cfg', configJson: JSON.stringify(Data) @@ -322,6 +326,7 @@ export default { this.$forceUpdate() }) DjyCustomerGet({ type: 'customer_cond_cfg' }).then(res => { + this.ColumnsQueryL = JSON.parse(res.data.configJson).length if (JSON.parse(res.data.configJson).length) { this.ColumnsQuery = [] columns.forEach(item => { @@ -404,4 +409,8 @@ button { height: 45px; overflow: hidden; } +.SetFlex { + display: flex; + justify-content: flex-end; +} diff --git a/src/views/main/Printing/addForm.vue b/src/views/main/Printing/addForm.vue index fee72ea..46fe601 100644 --- a/src/views/main/Printing/addForm.vue +++ b/src/views/main/Printing/addForm.vue @@ -27,7 +27,13 @@ - + 文件上传 @@ -44,6 +50,7 @@ export default { data() { return { file: {}, + fileList: [], labelCol: { xs: { span: 24 }, sm: { span: 7 } @@ -63,7 +70,7 @@ export default { this.file = data.file }, handleChange(info) { - console.log(this.file) + this.fileList = [info.file] }, // 初始化方法 add(record) { diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue index e4ec2cf..d54d4a7 100644 --- a/src/views/main/Printing/index.vue +++ b/src/views/main/Printing/index.vue @@ -41,7 +41,7 @@