From 9b8d5f687ff4f0820763b383ea61796dc352f5ce 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: Wed, 4 Sep 2024 16:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B4=B9=E7=94=A8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Form/src/components/AdvancedSearch.vue | 362 +++++--- .../FeeCustTemplate/TenantAuditStepModal.vue | 130 +++ .../infoclient/FeeCustTemplate/api.ts | 60 ++ .../infoclient/FeeCustTemplate/columns.tsx | 159 ++++ .../infoclient/FeeCustTemplate/feeField.vue | 878 ++++++++++++++++++ .../infoclient/FeeCustTemplate/index.vue | 147 +++ .../infoclient/TenantAuditStepModal.vue | 5 + .../fee/template/components/feeField.vue | 5 +- 8 files changed, 1601 insertions(+), 145 deletions(-) create mode 100644 src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue create mode 100644 src/views/baseinfo/infoclient/FeeCustTemplate/api.ts create mode 100644 src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx create mode 100644 src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue create mode 100644 src/views/baseinfo/infoclient/FeeCustTemplate/index.vue diff --git a/src/components/Form/src/components/AdvancedSearch.vue b/src/components/Form/src/components/AdvancedSearch.vue index e9fc5082..11268ad3 100644 --- a/src/components/Form/src/components/AdvancedSearch.vue +++ b/src/components/Form/src/components/AdvancedSearch.vue @@ -7,12 +7,12 @@ + >
-
- - +
+ +
-
-
+
+
@@ -51,23 +67,45 @@ - + {{ item.label }} - - - + + +
添加条件 - + 删除整组 @@ -82,16 +120,33 @@ 添加条件组 \ No newline at end of file + diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue new file mode 100644 index 00000000..1da08530 --- /dev/null +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue @@ -0,0 +1,130 @@ + + diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts new file mode 100644 index 00000000..0b2f7833 --- /dev/null +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/api.ts @@ -0,0 +1,60 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/feeApi/FeeCustTemplate/GetList', + edit = '/feeApi/FeeCustTemplate/Edit', + info = '/feeApi/FeeCustTemplate/Edit', + delete = '/feeApi/FeeCustTemplate/Delete', + GenerateFees = '/feeApi/FeeCustTemplate/GenerateFees', + GetColumns = '/mainApi/Common/GetColumnsByClient', +} +// 根据表明 查询数据 +export function getColumns(query: { id: string }) { + return request({ + url: Api.GetColumns, + method: 'get', + params: query, + }) +} +// 列表 (Auth) +export function ApiList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} +// 编辑 (Auth) +export function ApiEdit(data: PageRequest) { + return request({ + url: Api.edit, + method: 'post', + data, + }) +} +// 详情 (Auth) +export function ApiInfo(query) { + return request({ + url: Api.info, + method: 'get', + params: query, + }) +} +// 删除 (Auth) +export function ApiDel(data: PageRequest) { + return request({ + url: Api.delete, + method: 'post', + data + }) +} + +// 生成订单费用 (Auth) +export function ApiGenerateFees(data: PageRequest) { + return request({ + url: Api.GenerateFees, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx new file mode 100644 index 00000000..7d599a96 --- /dev/null +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx @@ -0,0 +1,159 @@ +import { ref } from 'vue' +import { BasicColumn, FormSchema } from '/@/components/Table' +// 引入字典数据 +import { getDictOption } from '/@/utils/dictUtil' +// 下拉框数据接口 +import { GetClientListByCode } from '/@/api/common' +// 往来单位下拉框数据 +const companyDict = ref([]) +let businessType: any = [ + { value: 1, label: '海运出口' }, + { value: 2, label: '海运进口' }, +] +export const columns: BasicColumn[] = [ + { + title: '模板名称', + dataIndex: 'name', + width: 200, + }, + { + title: '业务类型', + dataIndex: 'businessTypeText', + width: 200, + }, + { + title: '结算对象', + dataIndex: 'customerName', + width: 200, + }, + { + title: '说明', + dataIndex: 'description', + width: 200, + }, + { + title: '录入日期', + dataIndex: 'createTime', + width: 200, + }, + { + title: '备注', + dataIndex: 'note', + width: 200, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'name', + label: '模板名称', + component: 'Input', + colProps: { span: 6 }, + }, +] +export const formSchema: FormSchema[] = [ + { + label: '主键Id', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'name', + label: '模板名称', + component: 'Input', + required: true, + colProps: { span: 8 }, + }, + { + field: 'businessType', + label: '业务类型', + component: 'Select', + required: true, + colProps: { span: 8 }, + componentProps: () => { + return { + options: businessType, + } + }, + }, + // { + // field: 'customerType', + // label: '客户类别', + // defaultValue: '', + // component: 'ApiSelect', + // colProps: { span: 5 }, + // componentProps: ({ formModel }) => { + // return { + // api: () => { + // return new Promise((resolve) => { + // getDictOption('djy_cust_prop').then((res) => { + // console.log(res, 111111111111111) + + // resolve(res) + // }) + // }) + // }, + // labelField: 'label', + // valueField: 'value', + // resultField: 'data', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // onChange: (v: string, obj) => { + // GetClientListByCode({ code: v }).then((res) => { + // const { data } = res + // data.forEach((item) => { + // item['label'] = item.shortName + // item['value'] = item.codeName + // }) + // companyDict.value = data + // }) + // }, + // } + // }, + // }, + { + field: 'customerId', + label: '结算对象', + defaultValue: '', + component: 'Input', + show: false, + colProps: { span: 8 }, + }, + { + field: 'customerName', + label: '结算对象', + component: 'Input', + defaultValue: '', + dynamicDisabled: true, + colProps: { span: 8 }, + }, + // { + // label: '', + // field: 'customerId', + // component: 'Input', + // defaultValue: '', + // show: false, + // }, + // { + // label: '', + // field: 'customerType', + // component: 'Input', + // defaultValue: '', + // show: false, + // }, + { + field: 'description', + label: '模板说明', + component: 'Input', + colProps: { span: 8 }, + }, + { + field: 'note', + label: '备注', + component: 'Input', + colProps: { span: 16 }, + }, +] diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue new file mode 100644 index 00000000..2a7c4746 --- /dev/null +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue @@ -0,0 +1,878 @@ + + + + diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue new file mode 100644 index 00000000..d5bc6c40 --- /dev/null +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue @@ -0,0 +1,147 @@ + + + diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index d87935b1..ff3ef210 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -138,6 +138,10 @@
+ + + + @@ -189,6 +193,7 @@ import Menus2 from './menu2/index.vue' import Menus3 from './menu3/index.vue' import CustTemplateDetail from './custTemplateDetail/index.vue' + import FeeCustTemplate from './FeeCustTemplate/index.vue' import { useModal } from '/@/components/Modal' import CustomerParams from './customerParams/index.vue' import ReleaseType from './ReleaseType/index.vue' diff --git a/src/views/fee/template/components/feeField.vue b/src/views/fee/template/components/feeField.vue index 9498a0bb..1c4565b3 100644 --- a/src/views/fee/template/components/feeField.vue +++ b/src/views/fee/template/components/feeField.vue @@ -29,7 +29,7 @@
- +
@@ -53,7 +53,7 @@ GetClientListByCode, GetFeeCurrencySelectList, GetClientSelectInfoByCode, - GetUnitSelectInfo + GetUnitSelectInfo, } from '/@/api/common' import { GetFeeTemplateDetailList, BatchDelFeeTemplateDetail } from '../api' // 引入计费标准字典 @@ -499,7 +499,6 @@ // r = k // } // list.value[changes[0][0]]['quantity'] = r - } // 修改币别 if (changes[0][1] === 'currencyName') {