diff --git a/.env.development b/.env.development index 77f9b16..c3aa1bc 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 是否打开mock -VITE_USE_MOCK = true +VITE_USE_MOCK = false # 发布路径 VITE_PUBLIC_PATH = / diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 7065ceb..c09cdc8 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -3,6 +3,7 @@ import { message } from 'ant-design-vue'; import { useGlobSetting } from '/@/hooks/setting'; const globSetting = useGlobSetting(); const baseUploadUrl = globSetting.uploadUrl; +const baseApiUrl = globSetting.apiUrl; enum Api { positionList = '/sys/position/list', userList = '/sys/user/list', @@ -28,7 +29,7 @@ export const getNuList = (params) => { /** * 上传父路径 */ -export const uploadUrl = `${baseUploadUrl}/sys/common/upload`; +export const uploadUrl = `${baseApiUrl}/sys/common/upload`; /** * 职务列表 diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue index 5d51502..afc79a5 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue @@ -10,7 +10,7 @@ import JModal from '/@/components/Modal/src/JModal/JModal.vue'; const title = ref(''); - const width = ref('80%'); + const width = ref(1200); const visible = ref(false); const disableSubmit = ref(false); const registerForm = ref(); diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts index 6f08477..e91e5ae 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts +++ b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts @@ -55,6 +55,13 @@ export const columns: BasicColumn[] = [ ]; export const selectedColumns: BasicColumn[] = [ + { + title: '序号', + dataIndex: 'index', + key: 'index', + width: 60, + align: 'center', + }, { title: '分类标签', align: 'center', diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue index c7eaac3..478abc1 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue +++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue @@ -55,6 +55,9 @@ +
+ 共 {{ directiveList.length }} 条记录 +
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 8e8403d..3c4a8a9 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -46,7 +46,7 @@ --> - + diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index 9a9e39d..a4d5a3b 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -3,7 +3,7 @@