提交 e968026d authored 作者: leon's avatar leon

fix 属性抽出时,枚举值再次抽出

上级 1d76f3e5
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
import { AppProvider } from '/@/components/Application'; import { AppProvider } from '/@/components/Application';
import { useTitle } from '/@/hooks/web/useTitle'; import { useTitle } from '/@/hooks/web/useTitle';
import { useLocale } from '/@/locales/useLocale'; import { useLocale } from '/@/locales/useLocale';
// support Multi-language // support Multi-language
const { getAntdLocale } = useLocale(); const { getAntdLocale } = useLocale();
......
...@@ -6,16 +6,16 @@ import get from 'lodash.get'; ...@@ -6,16 +6,16 @@ import get from 'lodash.get';
import * as HospitalApi from '/@/api/system/hospitalApi'; import * as HospitalApi from '/@/api/system/hospitalApi';
import * as DoctorApi from '/@/api/system/doctorApi'; import * as DoctorApi from '/@/api/system/doctorApi';
import * as UserApi from '/@/api/system/userApi'; import * as UserApi from '/@/api/system/userApi';
import { StatusValEnum as DoctorStatusValEnum } from '/@/views/system/doctor/schema'; import { StatusValEnum as DoctorStatusValEnum } from '/@/views/system/doctor/enum';
import { StatusValEnum as UserStatusValEnum } from '/@/views/system/user/schema'; import { StatusValEnum as UserStatusValEnum } from '/@/views/system/user/enum';
import { RoleEnum } from '/@/views/system/role/role.data'; import { RoleEnum } from '/@/views/system/role/enum';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
interface gerPropType { interface gerPropType {
colProps?: any; colProps?: any;
onChange?: any; onChange?: any;
} }
const userStore = useUserStore(); const userStore = useUserStore();
export const getDistributorText = (text) => { const getDistributorText = (text) => {
if (text === 0) { if (text === 0) {
return '供应商创建'; return '供应商创建';
} else { } else {
...@@ -178,4 +178,4 @@ const getSaleUserId = ({ colProps }) => { ...@@ -178,4 +178,4 @@ const getSaleUserId = ({ colProps }) => {
}, },
}; };
}; };
export { getDistributorId, getHospitalId, getDoctorId, getHospitalIdAndDoctorId, getSaleUserId }; export { getDistributorText, getDistributorId, getHospitalId, getDoctorId, getHospitalIdAndDoctorId, getSaleUserId };
...@@ -17,14 +17,12 @@ import { registerGlobComp } from '/@/components/registerGlobComp'; ...@@ -17,14 +17,12 @@ import { registerGlobComp } from '/@/components/registerGlobComp';
import Antd from 'ant-design-vue'; import Antd from 'ant-design-vue';
import 'ant-design-vue/dist/antd.css'; import 'ant-design-vue/dist/antd.css';
import 'dayjs/locale/zh-cn'; import 'dayjs/locale/zh-cn';
// Importing on demand in local development will increase the number of browser requests by around 20%. // Importing on demand in local development will increase the number of browser requests by around 20%.
// This may slow down the browser refresh speed. // This may slow down the browser refresh speed.
// Therefore, only enable on-demand importing in production environments . // Therefore, only enable on-demand importing in production environments .
if (import.meta.env.DEV) { if (import.meta.env.DEV) {
import('ant-design-vue/dist/antd.less'); import('ant-design-vue/dist/antd.less');
} }
async function bootstrap() { async function bootstrap() {
const app = createApp(App); const app = createApp(App);
......
...@@ -68,10 +68,10 @@ ...@@ -68,10 +68,10 @@
isShowHandleReject, isShowHandleReject,
isShowHandleDelete, isShowHandleDelete,
getVerifyParams, getVerifyParams,
StatusValEnum,
} from './schema'; } from './schema';
import { StatusValEnum } from './enum';
import DoctorDrawer from './drawer.vue'; import DoctorDrawer from './drawer.vue';
import { onMounted, computed, ref, reactive, toRef } from 'vue'; import { onMounted, computed, ref, reactive } from 'vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { ComputedRef } from '@vue/reactivity'; import { ComputedRef } from '@vue/reactivity';
import { Descriptions, Card } from 'ant-design-vue'; import { Descriptions, Card } from 'ant-design-vue';
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<script lang="ts" setup name="DoctorDrawer"> <script lang="ts" setup name="DoctorDrawer">
import { defineEmits, ref, computed, unref } from 'vue'; import { defineEmits, ref, computed, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema, StatusValEnum } from './schema'; import { formSchema } from './schema';
import { StatusValEnum } from './enum';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import * as DoctorApi from '/@/api/system/doctorApi'; import * as DoctorApi from '/@/api/system/doctorApi';
import { useAsyncState } from '@vueuse/core'; import { useAsyncState } from '@vueuse/core';
......
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
...@@ -5,14 +5,16 @@ ...@@ -5,14 +5,16 @@
* @Author: xiongwei * @Author: xiongwei
* @Date: 2022-06-28 11:50:00 * @Date: 2022-06-28 11:50:00
*/ */
console.log('a');
import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
console.log('getDistributorId', getDistributorId);
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
import { usePermission } from '/@/hooks/web/usePermission'; import { usePermission } from '/@/hooks/web/usePermission';
import { BatchVerifyParams } from '/@/api/model/doctor'; import { BatchVerifyParams } from '/@/api/model/doctor';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { phoneRule } from '/@/commonSchemaProperty/formRules'; import { phoneRule } from '/@/commonSchemaProperty/formRules';
import { StatusValEnum } from './enum';
const userStore = useUserStore(); const userStore = useUserStore();
const { hasPermission } = usePermission(); const { hasPermission } = usePermission();
export enum SexEnum { export enum SexEnum {
...@@ -38,12 +40,6 @@ export enum StatusColorEnum { ...@@ -38,12 +40,6 @@ export enum StatusColorEnum {
REJECT = 'error', REJECT = 'error',
FORBIDDEN = 'default', FORBIDDEN = 'default',
} }
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
export const isShowHandlePassed = (status: string): boolean => { export const isShowHandlePassed = (status: string): boolean => {
return ( return (
......
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
</div> </div>
</template> </template>
<script lang="ts" setup name="DeviceDetail"> <script lang="ts" setup name="DeviceDetail">
import { StatusValEnum } from './enum';
import { ImagePreview } from '/@/components/Preview/index'; import { ImagePreview } from '/@/components/Preview/index';
import { Icon } from '/@/components/Icon'; import { Icon } from '/@/components/Icon';
import { import {
...@@ -72,7 +73,6 @@ ...@@ -72,7 +73,6 @@
isShowHandleReject, isShowHandleReject,
isShowHandleDelete, isShowHandleDelete,
getVerifyParams, getVerifyParams,
StatusValEnum,
} from './schema'; } from './schema';
import ReceiverDrawer from './drawer.vue'; import ReceiverDrawer from './drawer.vue';
import { onMounted, computed, ref, reactive } from 'vue'; import { onMounted, computed, ref, reactive } from 'vue';
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
<script lang="ts" setup name="ReceiverDrawer"> <script lang="ts" setup name="ReceiverDrawer">
import { defineEmits, ref, computed, unref } from 'vue'; import { defineEmits, ref, computed, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema, StatusValEnum } from './schema'; import { formSchema } from './schema';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import * as ReceiverApi from '/@/api/system/receiverApi'; import * as ReceiverApi from '/@/api/system/receiverApi';
import { useAsyncState } from '@vueuse/core'; import { useAsyncState } from '@vueuse/core';
import { Receiver } from '/@/api/model/receiver'; import { Receiver } from '/@/api/model/receiver';
import { StatusValEnum } from './enum';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const isUpdate = ref(true); const isUpdate = ref(true);
const entityId = ref(0); const entityId = ref(0);
......
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
...@@ -14,6 +14,7 @@ import { usePermission } from '/@/hooks/web/usePermission'; ...@@ -14,6 +14,7 @@ import { usePermission } from '/@/hooks/web/usePermission';
import { BatchVerifyParams } from '/@/api/model/receiver'; import { BatchVerifyParams } from '/@/api/model/receiver';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { phoneRule } from '/@/commonSchemaProperty/formRules'; import { phoneRule } from '/@/commonSchemaProperty/formRules';
import { StatusValEnum } from './enum';
const { hasPermission } = usePermission(); const { hasPermission } = usePermission();
const userStore = useUserStore(); const userStore = useUserStore();
export enum YesNoEnum { export enum YesNoEnum {
...@@ -40,12 +41,6 @@ export enum StatusColorEnum { ...@@ -40,12 +41,6 @@ export enum StatusColorEnum {
REJECT = 'error', REJECT = 'error',
FORBIDDEN = 'default', FORBIDDEN = 'default',
} }
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
export const StatusOptions: any[] = []; export const StatusOptions: any[] = [];
for (const key in StatusEnum) { for (const key in StatusEnum) {
......
export enum RoleEnum {
SALESMAN = 'salesman',
}
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
export enum RoleEnum {
SALESMAN = 'salesman',
}
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '角色名称', title: '角色名称',
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<script lang="ts" setup name="UserDrawer"> <script lang="ts" setup name="UserDrawer">
import { defineEmits, ref, computed, unref } from 'vue'; import { defineEmits, ref, computed, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema, StatusValEnum, PASSWORD } from './schema'; import { formSchema, PASSWORD } from './schema';
import { StatusValEnum } from './enum';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import * as UserApi from '/@/api/system/userApi'; import * as UserApi from '/@/api/system/userApi';
import { useAsyncState } from '@vueuse/core'; import { useAsyncState } from '@vueuse/core';
......
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
...@@ -12,6 +12,7 @@ import * as RoleApi from '/@/api/system/roleApi'; ...@@ -12,6 +12,7 @@ import * as RoleApi from '/@/api/system/roleApi';
import { getDistributorId } from '/@/commonSchemaProperty'; import { getDistributorId } from '/@/commonSchemaProperty';
import { usePermission } from '/@/hooks/web/usePermission'; import { usePermission } from '/@/hooks/web/usePermission';
import { phoneRule } from '/@/commonSchemaProperty/formRules'; import { phoneRule } from '/@/commonSchemaProperty/formRules';
import { StatusValEnum } from '/@/views/system/user/enum';
const { hasPermission } = usePermission(); const { hasPermission } = usePermission();
export interface BatchVerifyParams { export interface BatchVerifyParams {
/** /**
...@@ -57,12 +58,6 @@ export enum StatusColorEnum { ...@@ -57,12 +58,6 @@ export enum StatusColorEnum {
REJECT = 'error', REJECT = 'error',
FORBIDDEN = 'default', FORBIDDEN = 'default',
} }
export enum StatusValEnum {
PENDING_REVIEW = 'PENDING_REVIEW',
PASSED = 'PASSED',
REJECT = 'REJECT',
FORBIDDEN = 'FORBIDDEN',
}
export const isShowHandlePassed = (status: string): boolean => { export const isShowHandlePassed = (status: string): boolean => {
return ( return (
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论