From fc3e7c10b76e5399bb32cc75806e442a8b5455d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Mon, 27 Oct 2025 15:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E9=81=93=E6=B0=94=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mdm/CountryRegion/index.ts | 2 +- src/api/mdm/PipelineGgasLine/index.ts | 15 ++ src/components/Form/src/componentMap.ts | 2 + .../src/components/SelectAreaCascader.vue | 187 ++++++++++++++++++ src/components/Form/src/types/index.ts | 1 + src/components/SimpleForm/componentMap.ts | 3 +- src/components/SimpleForm/types/index.ts | 3 +- src/components/pcitc/src/DataLog.vue | 12 +- src/utils/helper/designHelper.ts | 1 + src/views/mdm/Bank/components/Form.vue | 13 +- src/views/mdm/Bank/components/config.ts | 76 +++---- .../mdm/ExpenseName/components/config.ts | 2 +- .../mdm/PipelineGgasLine/components/Form.vue | 44 ++++- .../mdm/PipelineGgasLine/components/config.ts | 13 +- src/views/mdm/TaxRate/components/config.ts | 2 +- src/views/mdm/TaxRate/index.vue | 2 +- 16 files changed, 297 insertions(+), 81 deletions(-) create mode 100644 src/components/Form/src/components/SelectAreaCascader.vue diff --git a/src/api/mdm/CountryRegion/index.ts b/src/api/mdm/CountryRegion/index.ts index af6a01b..c65c563 100644 --- a/src/api/mdm/CountryRegion/index.ts +++ b/src/api/mdm/CountryRegion/index.ts @@ -35,7 +35,7 @@ export async function getTreeData(params: LngBRegionPageParams, mode: ErrorMessa /** * @description: 分节点查询LngBRegion树 */ -export async function getTreeChild(params: LngBRegionPageParams, mode: ErrorMessageMode = 'modal') { +export async function getAreaList(params: LngBRegionPageParams, mode: ErrorMessageMode = 'modal') { return defHttp.get( { url: Api.TreeChild, diff --git a/src/api/mdm/PipelineGgasLine/index.ts b/src/api/mdm/PipelineGgasLine/index.ts index 6447f4f..f126f19 100644 --- a/src/api/mdm/PipelineGgasLine/index.ts +++ b/src/api/mdm/PipelineGgasLine/index.ts @@ -14,6 +14,7 @@ enum Api { Disable= '/mdm/pipelineGgasLine/disable', DataLog = '/mdm/pipelineGgasLine/datalog', + lNGStation = '/mdm/lNGStation/list' } /** @@ -119,4 +120,18 @@ export async function disableLngBPngLine(ids: string[], mode: ErrorMessageMode = errorMessageMode: mode, }, ); +} +/** + * @description: 获取LNG气源地数据 + */ +export async function getIngStation(params: LngBPngLinePageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.lNGStation, + params + }, + { + errorMessageMode: mode, + }, + ); } \ No newline at end of file diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts index ae16bb2..f6a7a40 100644 --- a/src/components/Form/src/componentMap.ts +++ b/src/components/Form/src/componentMap.ts @@ -27,6 +27,7 @@ import SelectUserV2 from './components/SelectUserV2.vue'; import SelectUserShowTree from './components/SelectUserShowTree.vue'; import CommonInfo from './components/CommonInfo.vue'; import SelectArea from './components/SelectArea.vue'; +import SelectAreaCascader from './components/SelectAreaCascader.vue'; import AutoCodeRule from './components/AutoCodeRule.vue'; import MoneyChineseInput from './components/MoneyChineseInput.vue'; import Image from './components/Image.vue'; @@ -108,6 +109,7 @@ componentMap.set('User', SelectUserV2); componentMap.set('UserTree', SelectUserShowTree); componentMap.set('Info', CommonInfo); componentMap.set('Area', SelectArea); +componentMap.set('AreaCascader', SelectAreaCascader); componentMap.set('SubForm', SubForm); componentMap.set('Button', Button); componentMap.set('SelectMap', SelectMap); diff --git a/src/components/Form/src/components/SelectAreaCascader.vue b/src/components/Form/src/components/SelectAreaCascader.vue new file mode 100644 index 0000000..472c2ed --- /dev/null +++ b/src/components/Form/src/components/SelectAreaCascader.vue @@ -0,0 +1,187 @@ + + diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts index 70e5b5a..258401a 100644 --- a/src/components/Form/src/types/index.ts +++ b/src/components/Form/src/types/index.ts @@ -130,6 +130,7 @@ export type ComponentType = | 'UserTree' | 'Info' | 'Area' + | 'AreaCascader' | 'SubForm' | 'DicSelect' | 'DbSelect' diff --git a/src/components/SimpleForm/componentMap.ts b/src/components/SimpleForm/componentMap.ts index d8c3a1d..680d2be 100644 --- a/src/components/SimpleForm/componentMap.ts +++ b/src/components/SimpleForm/componentMap.ts @@ -32,6 +32,7 @@ import SelectUser from './components/SelectUser.vue'; import CommonInfo from './components/CommonInfo.vue'; import SelectArea from './components/SelectArea.vue'; // import SelectArea from './components/SelectArea.vue'; +import SelectAreaCascader from './components/SelectAreaCascader.vue'; import { BasicUpload } from '/@/components/Upload'; import { StrengthMeter } from '/@/components/StrengthMeter'; @@ -69,7 +70,7 @@ componentMap.set('Dept', SelectDepartment); componentMap.set('User', SelectUser); componentMap.set('Info', CommonInfo); componentMap.set('Area', SelectArea); - +componentMap.set('AreaCascader', SelectAreaCascader); componentMap.set('DatePicker', DatePicker); componentMap.set('MonthPicker', DatePicker.MonthPicker); componentMap.set('RangePicker', DatePicker.RangePicker); diff --git a/src/components/SimpleForm/types/index.ts b/src/components/SimpleForm/types/index.ts index d1fd457..35e9336 100644 --- a/src/components/SimpleForm/types/index.ts +++ b/src/components/SimpleForm/types/index.ts @@ -248,4 +248,5 @@ export type ComponentType = | 'User' | 'Info' | 'Area' - | 'Text'; + | 'AreaCascader' + | 'Text' diff --git a/src/components/pcitc/src/DataLog.vue b/src/components/pcitc/src/DataLog.vue index e29cf5b..61c4f11 100644 --- a/src/components/pcitc/src/DataLog.vue +++ b/src/components/pcitc/src/DataLog.vue @@ -21,7 +21,7 @@ title: '表名', dataIndex: 'tableName', key: 'tableName', - width: 100, + width: 130, ellipsis: true, sorter: true }, @@ -29,7 +29,7 @@ title: '属性名称', dataIndex: 'name', key: 'name', - width: 100, + width: 130, ellipsis: true, sorter: true @@ -38,7 +38,7 @@ title: '操作类型', dataIndex: 'operationType', key: 'operationType', - width: 80, + width: 100, sorter: true, customRender: ({ record }) => { let text = record.operationType @@ -52,7 +52,7 @@ title: '原数据', dataIndex: 'oldValue', key: 'oldValue', - width: 150, + // width: 150, ellipsis: true, sorter: true }, @@ -60,7 +60,7 @@ title: '新数据', dataIndex: 'newValue', key: 'newValue', - width: 150, + // width: 150, ellipsis: true, sorter: true }, @@ -75,7 +75,7 @@ title: '操作IP', dataIndex: 'operationIp', key: 'operationIp', - width: 150, + width: 120, sorter: true }, { diff --git a/src/utils/helper/designHelper.ts b/src/utils/helper/designHelper.ts index cfa5b0e..41fae6a 100644 --- a/src/utils/helper/designHelper.ts +++ b/src/utils/helper/designHelper.ts @@ -616,6 +616,7 @@ export function buildAppComponentType(type: string): AppComponentType { return AppComponentType.select; case 'area': + case 'areacascader': case 'cascader': return AppComponentType.cascader; diff --git a/src/views/mdm/Bank/components/Form.vue b/src/views/mdm/Bank/components/Form.vue index 7ec809a..616c970 100644 --- a/src/views/mdm/Bank/components/Form.vue +++ b/src/views/mdm/Bank/components/Form.vue @@ -44,13 +44,6 @@ let customFormEventConfigs=[]; onMounted(async () => { - const treeData = await getTreeData({}) - formProps.schemas?.forEach(v => { - if (v.field == 'regionCode') { - v.componentProps.options = treeData - } - }) - console.log(formProps.schemas, 667) try { // 合并渲染覆盖配置中的字段配置、表单事件配置 await mergeCustomFormRenderConfig(); @@ -125,7 +118,7 @@ async function setFormDataFromId(rowId, skipUpdate) { try { let record = await getLngBBank(rowId); - record = {...record, regionCode: (record.regionCode || []).split(',')} + record = {...record} if (skipUpdate) { return record; } @@ -158,7 +151,7 @@ try { values[RowKey] = rowId; state.formModel = values; - let saveVal = await updateLngBBank({...values, regionCode: (values.regionCode||[]).join(',')}); + let saveVal = await updateLngBBank({...values}); await submitFormEvent(customFormEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件:提交表单 @@ -169,7 +162,7 @@ async function add(values) { try { state.formModel = values; - let saveVal = await addLngBBank({...values, regionCode: (values.regionCode||[]).join(',')}); + let saveVal = await addLngBBank({...values}); await submitFormEvent(customFormEventConfigs, state.formModel, systemFormRef.value, formProps.schemas); //表单事件:提交表单 diff --git a/src/views/mdm/Bank/components/config.ts b/src/views/mdm/Bank/components/config.ts index a2e27c1..5c1d59a 100644 --- a/src/views/mdm/Bank/components/config.ts +++ b/src/views/mdm/Bank/components/config.ts @@ -329,58 +329,33 @@ export const formProps: FormProps = { }, }, { - key: '4', + key: '1485b829c80a493bb55f37d1c839ccc9', field: 'regionCode', label: '所属国家/地区', - type: 'cascader', - component: 'Cascader', + type: 'areacascader', + component: 'AreaCascader', colProps: { span: 8 }, - defaultValue: [], componentProps: { - options: [ - // { - // value: 'zhejiang', - // label: '浙江省', - // children: [ - // { - // value: 'hangzhou', - // label: '杭州市', - // children: [ - // { - // value: 'xihu', - // label: '西湖区', - // }, - // ], - // }, - // ], - // } - ], - fieldNames: {label: 'fullName', value: 'code', children: 'children'}, - width: '100%', - span: '', - defaultValue: '', - labelWidthMode: 'fix', - labelFixWidth: 120, - responsive: false, - respNewRow: false, - placeholder: '请选择', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', - disabled: false, - allowClear: false, - showLabel: true, - required: false, - rules: [], - events: {}, - isSave: false, - isShow: true, - scan: false, - style: { width: '100%' }, - }, - }, + width: '100%', + span: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请选择区域', + showLabel: true, + disabled: false, + allowClear: true, + clearable: false, + required: false, + rules: [], + events: {}, + isShow: true, + style: { width: '100%' }, + fieldNames: {label: 'fullName', value: 'code', children: 'children'}, + excludeType: 'CONTINENT' + } + }, { key: '6461a5e152124abca28bd2114dd577e6', field: 'swift', @@ -519,15 +494,16 @@ export const formProps: FormProps = { }, { key: '8', - field: 'soft', + field: 'sort', label: '显示顺序', type: 'input', component: 'InputNumber', colProps: { span: 8 }, - defaultValue: '', + defaultValue: null, componentProps: { width: '100%', span: '', + min:0, defaultValue: '', labelWidthMode: 'fix', labelFixWidth: 120, diff --git a/src/views/mdm/ExpenseName/components/config.ts b/src/views/mdm/ExpenseName/components/config.ts index 9315f74..5c3a21f 100644 --- a/src/views/mdm/ExpenseName/components/config.ts +++ b/src/views/mdm/ExpenseName/components/config.ts @@ -236,13 +236,13 @@ export const formProps: FormProps = { colProps: { span: 8 }, defaultValue: null, componentProps: { + min:0, labelWidthMode: 'fix', labelFixWidth: 120, responsive: false, width: '100%', span: '', defaultValue: null, - min: 0, max: null, step: 1, maxlength: null, diff --git a/src/views/mdm/PipelineGgasLine/components/Form.vue b/src/views/mdm/PipelineGgasLine/components/Form.vue index 1f58131..88c3cb4 100644 --- a/src/views/mdm/PipelineGgasLine/components/Form.vue +++ b/src/views/mdm/PipelineGgasLine/components/Form.vue @@ -7,10 +7,10 @@ />