From f925a683db30fed4042764155daba63d253a54f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Tue, 4 Nov 2025 17:34:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=90=8D=E7=A7=B0=20?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mdm/{ExpenseName => Fee}/index.ts | 16 +++++++------- .../model/FeeModel.ts} | 0 src/views/mdm/Bank/index.vue | 3 +-- .../components/FeeModal.vue} | 0 .../{ExpenseName => Fee}/components/Form.vue | 2 +- .../{ExpenseName => Fee}/components/config.ts | 0 .../components/workflowPermission.ts | 0 src/views/mdm/{ExpenseName => Fee}/index.vue | 22 +++++++++---------- 8 files changed, 21 insertions(+), 22 deletions(-) rename src/api/mdm/{ExpenseName => Fee}/index.ts (89%) rename src/api/mdm/{ExpenseName/model/ExpenseNameModel.ts => Fee/model/FeeModel.ts} (100%) rename src/views/mdm/{ExpenseName/components/ExpenseNameModal.vue => Fee/components/FeeModal.vue} (100%) rename src/views/mdm/{ExpenseName => Fee}/components/Form.vue (99%) rename src/views/mdm/{ExpenseName => Fee}/components/config.ts (100%) rename src/views/mdm/{ExpenseName => Fee}/components/workflowPermission.ts (100%) rename src/views/mdm/{ExpenseName => Fee}/index.vue (95%) diff --git a/src/api/mdm/ExpenseName/index.ts b/src/api/mdm/Fee/index.ts similarity index 89% rename from src/api/mdm/ExpenseName/index.ts rename to src/api/mdm/Fee/index.ts index 351bdfd..9c394ad 100644 --- a/src/api/mdm/ExpenseName/index.ts +++ b/src/api/mdm/Fee/index.ts @@ -1,19 +1,19 @@ -import { LngBFeePageModel, LngBFeePageParams, LngBFeePageResult } from './model/ExpenseNameModel'; +import { LngBFeePageModel, LngBFeePageParams, LngBFeePageResult } from './model/FeeModel'; import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/mdm/expenseName/page', - List = '/mdm/expenseName/list', - Info = '/mdm/expenseName/info', - LngBFee = '/mdm/expenseName', + Page = '/mdm/fee/page', + List = '/mdm/fee/list', + Info = '/mdm/fee/info', + LngBFee = '/mdm/fee', - Enable = '/mdm/expenseName/enable', - Disable= '/mdm/expenseName/disable', + Enable = '/mdm/fee/enable', + Disable= '/mdm/fee/disable', - DataLog = '/mdm/expenseName/datalog', + DataLog = '/mdm/fee/datalog', } /** diff --git a/src/api/mdm/ExpenseName/model/ExpenseNameModel.ts b/src/api/mdm/Fee/model/FeeModel.ts similarity index 100% rename from src/api/mdm/ExpenseName/model/ExpenseNameModel.ts rename to src/api/mdm/Fee/model/FeeModel.ts diff --git a/src/views/mdm/Bank/index.vue b/src/views/mdm/Bank/index.vue index 6898025..8a357f4 100644 --- a/src/views/mdm/Bank/index.vue +++ b/src/views/mdm/Bank/index.vue @@ -62,8 +62,7 @@ const logPath = ref('/mdm/bank/datalog'); const { filterColumnAuth, filterButtonAuth } = usePermission(); const { mergeColumns,mergeSearchFormSchema,mergeButtons } = useFormConfig(); - // const filterColumns = cloneDeep(filterColumnAuth(columns)); - const filterColumns = cloneDeep(columns); + const filterColumns = cloneDeep(filterColumnAuth(columns)); const customConfigColums =ref(filterColumns); const customSearchFormSchema =ref(searchFormSchema); const selectedKeys = ref([]); diff --git a/src/views/mdm/ExpenseName/components/ExpenseNameModal.vue b/src/views/mdm/Fee/components/FeeModal.vue similarity index 100% rename from src/views/mdm/ExpenseName/components/ExpenseNameModal.vue rename to src/views/mdm/Fee/components/FeeModal.vue diff --git a/src/views/mdm/ExpenseName/components/Form.vue b/src/views/mdm/Fee/components/Form.vue similarity index 99% rename from src/views/mdm/ExpenseName/components/Form.vue rename to src/views/mdm/Fee/components/Form.vue index 62633fe..139016f 100644 --- a/src/views/mdm/ExpenseName/components/Form.vue +++ b/src/views/mdm/Fee/components/Form.vue @@ -10,7 +10,7 @@ import { reactive, ref,onBeforeMount,onMounted } from 'vue'; import { formProps, formEventConfigs ,formConfig} from './config'; import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue'; - import { addLngBFee, getLngBFee, updateLngBFee, deleteLngBFee } from '/@/api/mdm/ExpenseName'; + import { addLngBFee, getLngBFee, updateLngBFee, deleteLngBFee } from '/@/api/mdm/Fee'; import { cloneDeep } from 'lodash-es'; import { FormDataProps } from '/@/components/Designer/src/types'; import { usePermission } from '/@/hooks/web/usePermission'; diff --git a/src/views/mdm/ExpenseName/components/config.ts b/src/views/mdm/Fee/components/config.ts similarity index 100% rename from src/views/mdm/ExpenseName/components/config.ts rename to src/views/mdm/Fee/components/config.ts diff --git a/src/views/mdm/ExpenseName/components/workflowPermission.ts b/src/views/mdm/Fee/components/workflowPermission.ts similarity index 100% rename from src/views/mdm/ExpenseName/components/workflowPermission.ts rename to src/views/mdm/Fee/components/workflowPermission.ts diff --git a/src/views/mdm/ExpenseName/index.vue b/src/views/mdm/Fee/index.vue similarity index 95% rename from src/views/mdm/ExpenseName/index.vue rename to src/views/mdm/Fee/index.vue index dcdcbf5..956bdf1 100644 --- a/src/views/mdm/ExpenseName/index.vue +++ b/src/views/mdm/Fee/index.vue @@ -20,7 +20,7 @@ - + @@ -30,12 +30,12 @@ } from 'vue'; const modalVisible = ref(false); const logId = ref('') - const logPath = ref('/mdm/expenseName/datalog'); + const logPath = ref('/mdm/fee/datalog'); import { DataLog } from '/@/components/pcitc'; import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'; - import { getLngBFeePage, deleteLngBFee} from '/@/api/mdm/ExpenseName'; + import { getLngBFeePage, deleteLngBFee} from '/@/api/mdm/Fee'; import { PageWrapper } from '/@/components/Page'; import { useMessage } from '/@/hooks/web/useMessage'; import { useI18n } from '/@/hooks/web/useI18n'; @@ -43,9 +43,9 @@ import { useFormConfig } from '/@/hooks/web/useFormConfig'; import { useRouter } from 'vue-router'; import { setIndexFlowStatus } from '/@/utils/flow/index' - import { getLngBFee, enableLngBFee, disableLngBFee } from '/@/api/mdm/ExpenseName'; + import { getLngBFee, enableLngBFee, disableLngBFee } from '/@/api/mdm/Fee'; import { useModal } from '/@/components/Modal'; - import ExpenseNameModal from './components/ExpenseNameModal.vue'; + import FeeModal from './components/FeeModal.vue'; import {formConfig, searchFormSchema, columns } from './components/config'; import Icon from '/@/components/Icon/index'; import useEventBus from '/@/hooks/event/useEventBus'; @@ -165,9 +165,9 @@ }); } else { router.push({ - path: '/form/ExpenseName/' + record.id + '/viewForm', + path: '/form/Fee/' + record.id + '/viewForm', query: { - formPath: 'mdm/ExpenseName', + formPath: 'mdm/Fee', formName: formName, formId:currentRoute.value.meta.formId } @@ -187,9 +187,9 @@ }); } else { router.push({ - path: '/form/ExpenseName/0/createForm', + path: '/form/Fee/0/createForm', query: { - formPath: 'mdm/ExpenseName', + formPath: 'mdm/Fee', formName: formName, formId:currentRoute.value.meta.formId } @@ -200,9 +200,9 @@ function handleEdit(record: Recordable) { router.push({ - path: '/form/ExpenseName/' + record.id + '/updateForm', + path: '/form/Fee/' + record.id + '/updateForm', query: { - formPath: 'mdm/ExpenseName', + formPath: 'mdm/Fee', formName: formName, formId:currentRoute.value.meta.formId } From 76fbfca5f5b3f41614483c12c46d616c131d2aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Wed, 5 Nov 2025 17:43:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Form/src/components/SelectAreaCascader.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/components/Form/src/components/SelectAreaCascader.vue b/src/components/Form/src/components/SelectAreaCascader.vue index 472c2ed..2296fb8 100644 --- a/src/components/Form/src/components/SelectAreaCascader.vue +++ b/src/components/Form/src/components/SelectAreaCascader.vue @@ -18,6 +18,7 @@ import { LoadingOutlined } from '@ant-design/icons-vue'; import { useI18n } from '/@/hooks/web/useI18n'; import { getAreaList } from '/@/api/mdm/CountryRegion'; + import { requestMagicApi } from '/@/api/magicApi'; interface Option { value: string; @@ -59,6 +60,17 @@ if (isChange.value) return; if (val) { + let arr = val.split(',') + console.log(arr, 88888) + const resData = await requestMagicApi({ + method: "get", + url: "mdm/getRegionByCode", + body: undefined, + query: { + code: arr[arr.length-1] + } + }); + console.log(resData, 'resData') emitData.value = val.split(','); } else { emitData.value = [];