Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

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',
 }
 
 /**

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 = [];

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<string[]>([]);

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';

src/views/mdm/Fee/index.vue

@@ -20,7 +20,7 @@
           </template>
         </template>
       </BasicTable>
-   <ExpenseNameModal @register="registerModal" @success="handleSuccess" />
+   <FeeModal @register="registerModal" @success="handleSuccess" />
    <DataLog :logId="logId" :logPath="logPath" v-model:visible="modalVisible"/>
   </PageWrapper>
 </template>
@@ -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
       }