From 9aa09de7d89a83fdccce3b66829043890c772690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Thu, 26 Sep 2024 16:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=20?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/baseinfo/goodsStatus/Modal.vue | 4 +- .../infoclient/FeeCustTemplate/feeField.vue | 34 ++-- src/views/baseinfo/infoclient/columns.tsx | 15 +- src/views/system/print/api.ts | 32 ++-- src/views/system/print/columns.tsx | 89 +++++----- src/views/system/print/index.vue | 158 ++++++++++-------- 6 files changed, 192 insertions(+), 140 deletions(-) diff --git a/src/views/baseinfo/goodsStatus/Modal.vue b/src/views/baseinfo/goodsStatus/Modal.vue index 2c05ca94..fc15a6f2 100644 --- a/src/views/baseinfo/goodsStatus/Modal.vue +++ b/src/views/baseinfo/goodsStatus/Modal.vue @@ -78,7 +78,9 @@ setModalProps({ loading: false }) }) - const getTitle = computed(() => (!unref(isUpdate) ? '新增EDI设置' : '编辑EDI设置')) + const getTitle = computed(() => + !unref(isUpdate) ? '新增订舱货物状态管理' : '编辑订舱货物状态管理', + ) async function handleSave(exit) { try { diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue index 5d5a176a..bf667046 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue @@ -265,19 +265,27 @@ data: 'unit', type: 'dropdown', source: async (query, process) => { - if (unitDict.value && unitDict.value.length) { - const dict = unitDict.value.map((item) => { - return item.value + '-' + item.name - }) - process(dict) - } else { - const results = await feeUnitDict() - unitDict.value = results - const dict = results.map((item) => { - return item.value + '-' + item.name - }) - process(dict) - } + // if (unitDict.value && unitDict.value.length) { + // const dict = unitDict.value.map((item) => { + // return item.value + '-' + item.name + // }) + // process(dict) + // } else { + // const results = await feeUnitDict() + // unitDict.value = results + // const dict = results.map((item) => { + // return item.value + '-' + item.name + // }) + // process(dict) + // } + const results = [ + { label: '20GP', name: '20GP', value: '22G0' }, + { label: '40GP', name: '40GP', value: '42G0' }, + ] + const dict = results.map((res) => { + return res.label + }) + process(dict) }, }, { diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 0b8de01c..ce62b375 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -417,7 +417,7 @@ export const searchFormSchema: FormSchema[] = [ label: '客户属性', field: 'clientTag', component: 'ApiSelect', - colProps: { span: 8 }, + colProps: { span: 4 }, componentProps: () => { return { api: () => { @@ -515,6 +515,19 @@ export const searchFormSchema: FormSchema[] = [ } }, }, + { + field: 'auditStatus', + label: '审批状态', + component: 'Select', + colProps: { span: 4 }, + componentProps: { + options: [ + { label: '待审批', value: 0 }, + { label: '审核通过', value: 1 }, + { label: '驳回', value: 2 }, + ], + }, + }, ] export const formSchema: FormSchema[] = [ diff --git a/src/views/system/print/api.ts b/src/views/system/print/api.ts index 22a3a162..7e0bc2ef 100644 --- a/src/views/system/print/api.ts +++ b/src/views/system/print/api.ts @@ -7,33 +7,45 @@ import { request } from '/@/utils/request' import { DataResult, PageRequest } from '/@/api/model/baseModel' enum Api { - list = '/mainApi/Print/GetOpenPrintTemplateList', - modalList = '/mainApi/Print/GetOpenPrintModuleList', - edit = '/mainApi/PrintTemplate//EditSysPrintModule', + // list = '/mainApi/Print/GetOpenPrintTemplateList', + // modalList = '/mainApi/Print/GetOpenPrintModuleList', + // edit = '/mainApi/PrintTemplate//EditSysPrintModule', + // temEidt = '/mainApi/PrintTemplate/EditSysPrintTemplate', + // temInfo = '/mainApi/PrintTemplate/GetSysPrintTemplateInfo', + // info = '/mainApi/PrintTemplate/GetSysPrintModuleInfo', + // delete = '/mainApi/ClientParam/BatchDelClientParam', + // GetTenantParamDataSelectList = '/mainApi/ClientParam/GetTenantParamDataSelectList', + // GetOpenSqlPrintInfo = '/printApi/OpenPrint/GetOpenSqlPrintInfo', + // DownLoadSqlPrintFile = '/printApi/OpenPrint/DownLoadSqlPrintFile' + // --------------------------- + list = '/mainApi/PrintTemplate/GetPrintModuleList', + modalList = '/mainApi/PrintTemplate/GetSysPrintTemplateList', + edit = '/mainApi/PrintTemplate/EditSysPrintModule', temEidt = '/mainApi/PrintTemplate/EditSysPrintTemplate', temInfo = '/mainApi/PrintTemplate/GetSysPrintTemplateInfo', info = '/mainApi/PrintTemplate/GetSysPrintModuleInfo', - delete = '/mainApi/ClientParam/BatchDelClientParam', + delete = '/mainApi/PrintTemplate/BatchDelPrintTemplate', GetTenantParamDataSelectList = '/mainApi/ClientParam/GetTenantParamDataSelectList', GetOpenSqlPrintInfo = '/printApi/OpenPrint/GetOpenSqlPrintInfo', DownLoadSqlPrintFile = '/printApi/OpenPrint/DownLoadSqlPrintFile' } -// 模版列表 (Auth) -export function GetSysPrintTemplateList(data) { +// 模块列表 +export function GetPrintModuleList(data) { return request({ url: Api.list, method: 'post', data }) } -// 模块列表 -export function GetPrintModuleList(params) { +// 模版列表 (Auth) +export function GetSysPrintTemplateList(data) { return request({ url: Api.modalList, - method: 'get', - params + method: 'post', + data }) } + // 模块编辑 (Auth) export function EditSysPrintModule(data: PageRequest) { return request({ diff --git a/src/views/system/print/columns.tsx b/src/views/system/print/columns.tsx index 84718d02..89024f97 100644 --- a/src/views/system/print/columns.tsx +++ b/src/views/system/print/columns.tsx @@ -1,38 +1,39 @@ /* - * @Description: + * @Description: * @Author: lijj * @Date: 2024-04-25 15:48:33 */ import { BasicColumn, FormSchema } from '/@/components/Table' import { GetPrintModuleList } from './api' import { GetCarrierSelectList } from '/@/api/common' +import { max } from 'lodash' export const columns: BasicColumn[] = [ { title: '模版名称', dataIndex: 'templateName', - width: 200 + width: 200, }, { title: '打印类型', dataIndex: 'printType', - width: 120 + width: 120, }, { title: '船公司', dataIndex: 'carrierName', - width: 150 + width: 150, }, { title: '入口参数', dataIndex: 'inParamColumn', - width: 200 + width: 200, }, { title: '备注', dataIndex: 'note', - width: 200 - } + width: 200, + }, ] export const searchFormSchema: FormSchema[] = [ @@ -40,7 +41,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'templateName', label: '模版名称', colProps: { span: 6 }, - component: 'Input' + component: 'Input', }, ] export const formSchema: FormSchema[] = [ @@ -49,27 +50,30 @@ export const formSchema: FormSchema[] = [ field: 'id', component: 'Input', defaultValue: '', - show: false + show: false, }, { field: 'moduleName', label: '模块名称', required: true, component: 'Input', - colProps: { span: 12 } + colProps: { span: 12 }, }, { field: 'moduleCode', label: '模块编码', required: true, component: 'Input', - colProps: { span: 12 } + colProps: { span: 12 }, + componentProps: { + maxlength: 4, + }, }, { field: 'sortNo', label: '排序', component: 'Input', - colProps: { span: 12 } + colProps: { span: 12 }, }, { field: 'disable', @@ -81,9 +85,9 @@ export const formSchema: FormSchema[] = [ componentProps: { options: [ { label: '禁用', value: 1 }, - { label: '启用', value: 0 } - ] - } + { label: '启用', value: 0 }, + ], + }, }, { field: 'note', @@ -91,33 +95,32 @@ export const formSchema: FormSchema[] = [ component: 'InputTextArea', colProps: { span: 24 }, componentProps: { - autoSize: { minRows: 5, maxRows: 5 } - } - } + autoSize: { minRows: 5, maxRows: 5 }, + }, + }, ] - export const temFormSchema: FormSchema[] = [ { label: '', field: 'id', component: 'Input', defaultValue: '', - show: false + show: false, }, { field: 'templateName', label: '模版名称', required: true, component: 'Input', - colProps: { span: 12 } + colProps: { span: 12 }, }, { field: 'templateCode', label: '模版编码', required: true, component: 'Input', - colProps: { span: 12 } + colProps: { span: 12 }, }, { label: '', @@ -150,9 +153,9 @@ export const temFormSchema: FormSchema[] = [ formModel.carrierId = null formModel.carrierName = null } - } + }, } - } + }, }, { field: 'printType', @@ -180,7 +183,7 @@ export const temFormSchema: FormSchema[] = [ field: 'moduleCode', label: '', component: 'Input', - show: false + show: false, }, { label: '所属模块', @@ -203,7 +206,7 @@ export const temFormSchema: FormSchema[] = [ }, onChange: (v, obj) => { if (obj) formModel.moduleCode = obj.moduleCode - } + }, } }, }, @@ -211,13 +214,13 @@ export const temFormSchema: FormSchema[] = [ field: 'templateName', label: '', component: 'Input', - show: false + show: false, }, { field: 'moduleId', label: '', component: 'Input', - show: false + show: false, }, { field: 'isUseDataSource', @@ -229,9 +232,9 @@ export const temFormSchema: FormSchema[] = [ componentProps: { options: [ { label: '是', value: 1 }, - { label: '否', value: 0 } - ] - } + { label: '否', value: 0 }, + ], + }, }, { field: 'sqlModel', @@ -241,7 +244,7 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 6 }, show: ({ values }) => { return values.isUseDataSource && values.id - } + }, }, { field: 'downModel', @@ -251,7 +254,7 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 6 }, show: ({ values }) => { return values.isUseDataSource && values.id - } + }, }, { field: 'sourceSql', @@ -260,11 +263,11 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 24 }, componentProps: { autoSize: { minRows: 3, maxRows: 20 }, - disTrans: true + disTrans: true, }, show: ({ values }) => { return values.isUseDataSource - } + }, }, { field: 'inParamColumn', @@ -273,7 +276,7 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 12 }, show: ({ values }) => { return values.isUseDataSource - } + }, }, { field: 'groupBy', @@ -282,7 +285,7 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 12 }, show: ({ values }) => { return values.isUseDataSource - } + }, }, { field: 'columnView', @@ -290,11 +293,11 @@ export const temFormSchema: FormSchema[] = [ component: 'InputTextArea', colProps: { span: 24 }, componentProps: { - autoSize: { minRows: 3, maxRows: 20 } + autoSize: { minRows: 3, maxRows: 20 }, }, show: ({ values }) => { return values.isUseDataSource - } + }, }, { field: 'printJsonContent', @@ -303,7 +306,7 @@ export const temFormSchema: FormSchema[] = [ colProps: { span: 24 }, componentProps: { autoSize: { minRows: 5, maxRows: 20 }, - disTrans: true - } - } -] \ No newline at end of file + disTrans: true, + }, + }, +] diff --git a/src/views/system/print/index.vue b/src/views/system/print/index.vue index dff1c6d0..4a63a28f 100644 --- a/src/views/system/print/index.vue +++ b/src/views/system/print/index.vue @@ -1,34 +1,33 @@