Jelajahi Sumber

refactor: 从灾害防范提取选择人员分组为通用组件

wyf 8 bulan lalu
induk
melakukan
1be584995e

+ 2 - 2
src/views/disaster/disaster-warning/src/components/SelectGroup.vue

@@ -14,9 +14,9 @@
 
 <script lang="ts" setup>
   import { ref, reactive, watch, onMounted } from 'vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from './components/GroupSelect.vue';
   import type { FormInstance } from 'element-plus';
-  import { useGroupInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from './hook/groupInfo';
 
   const props = defineProps<{
     userGroupList: number[];

src/views/disaster/components/Group.vue → src/components/PersonGroup/components/Group.vue


src/views/disaster/components/GroupSelect.vue → src/components/PersonGroup/components/GroupSelect.vue


src/views/disaster/hooks/groupInfo.ts → src/components/PersonGroup/hook/groupInfo.ts


+ 3 - 2
src/views/disaster/disaster-control/src/components/CreateDisposalManagementItem.vue

@@ -43,9 +43,10 @@
   import { useRoute } from 'vue-router';
   import { onMounted, ref, watch } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
+  import { useUserInfoHook, useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from '@/components/PersonGroup/hook/groupInfo';
   import type { DisposalManagementRuleForm } from '@/types/disaster-control';
   import {
     DISPOSAL_MANAGEMENT_ITEM_FROM_CONFIG_CREATE,

+ 5 - 9
src/views/disaster/disaster-control/src/components/CreateDisposalManagementTaskItem.vue

@@ -41,9 +41,10 @@
 <script setup lang="ts">
   import { onMounted, ref, watch } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
+  import { useUserInfoHook, useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from '@/components/PersonGroup/hook/groupInfo';
   import {
     DISPOSAL_MANAGEMENT_TASK_FROM_CONFIG,
     DISPOSAL_MANAGEMENT_TASK_FROM_DATA,
@@ -52,13 +53,8 @@
   import type { DisposalManagementRuleForm } from '@/types/disaster-control';
 
   const { realname } = useUserInfoHook();
-  const {
-    originalDisasterLevelDepts,
-    disasterLevelDepts,
-    getDisasterLevelDepts,
-    handleFilterMethod,
-    isFilterData,
-  } = useDeptInfoHook();
+  const { originalDisasterLevelDepts, disasterLevelDepts, getDisasterLevelDepts, handleFilterMethod, isFilterData } =
+    useDeptInfoHook();
   const { getUserGroupList, groupOptions } = useGroupInfoHook();
 
   const basicFormRef = ref<InstanceType<typeof BasicForm>>();

+ 3 - 2
src/views/disaster/disaster-control/src/components/CreateLossReportItem.vue

@@ -75,10 +75,11 @@
   import { onMounted, ref, watch } from 'vue';
   import UploadImages from './UploadImages.vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useDisasterControlHook } from '../hook';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
+  import { useUserInfoHook, useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from '@/components/PersonGroup/hook/groupInfo';
   import type { LossReportItemFormData } from '@/types/disaster-control';
   import {
     LOSS_REPORT_ITEM_FORM_CONFIG_LOSS,

+ 1 - 1
src/views/disaster/disaster-control/src/components/EditDisposalManagementItem.vue

@@ -18,7 +18,7 @@
   import { useRoute } from 'vue-router';
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useGroupInfoHook } from '@/views/disaster/hooks';
   import type { DisposalManagementRuleFormEdit } from '@/types/disaster-control';

+ 3 - 2
src/views/disaster/disaster-control/src/components/EditLossReportItem.vue

@@ -80,9 +80,10 @@
   import { onMounted, ref, watch } from 'vue';
   import UploadImages from './UploadImages.vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { useGroupInfoHook, useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from '@/components/PersonGroup/hook/groupInfo';
   import { useDisasterControlHook } from '../hook';
   import type { LossReportItemFormData } from '@/types/disaster-control';
   import { queryUserInfoByIds } from '@/api/system/person-group';

+ 3 - 2
src/views/disaster/disaster-precaution/src/components/CreateTaskItem.vue

@@ -51,9 +51,10 @@
 <script setup lang="ts">
   import { onMounted, ref, watch } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
-  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
+  import { useUserInfoHook, useDeptInfoHook } from '@/views/disaster/hooks';
+  import { useGroupInfoHook } from '@/components/PersonGroup/hook/groupInfo';
   import type { TaskManagementRuleForm } from '../type';
   import { TASK_MANAGEMENT_FROM_CONFIG_CREATE, TASK_MANAGEMENT_FROM_DATA, TASK_MANAGEMENT_FROM_RULES } from '../config';
   import { INSPECT_TYPE_OPTIONS } from '../constants/task-execution';

+ 1 - 1
src/views/disaster/disaster-precaution/src/components/EditTaskItem.vue

@@ -27,7 +27,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
+  import GroupSelect from '@/components/PersonGroup/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useGroupInfoHook } from '@/views/disaster/hooks';
   import type { TaskManagementRuleForm } from '../type';

+ 1 - 1
src/views/disaster/disaster-warning/src/components/CreateDefenseNoticeItem.vue

@@ -43,7 +43,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import SelectGroup from './SelectGroup.vue';
+  import SelectGroup from '@/components/PersonGroup/SelectGroup.vue';
   import UploadFiles from '@/views/disaster/components/UploadFiles.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useDisasterWarningHook } from '../hook';

+ 1 - 1
src/views/disaster/disaster-warning/src/components/CreateWarningInfoItem.vue

@@ -40,7 +40,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import SelectGroup from './SelectGroup.vue';
+  import SelectGroup from '@/components/PersonGroup/SelectGroup.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useUserInfoHook } from '@/views/disaster/hooks';
   import { useDisasterWarningHook } from '../hook';

+ 1 - 1
src/views/disaster/disaster-warning/src/components/EditDefenseNoticeItem.vue

@@ -49,7 +49,7 @@
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
   import UploadFiles from '@/views/disaster/components/UploadFiles.vue';
-  import SelectGroup from './SelectGroup.vue';
+  import SelectGroup from '@/components/PersonGroup/SelectGroup.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useDisasterWarningHook } from '../hook';
   import type { DefenseNoticeRuleForm } from '../type';

+ 1 - 1
src/views/disaster/disaster-warning/src/components/EditWarningInfoItem.vue

@@ -40,7 +40,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
-  import SelectGroup from './SelectGroup.vue';
+  import SelectGroup from '@/components/PersonGroup/SelectGroup.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useDisasterWarningHook } from '../hook';
   import type { WarningInfoRuleForm } from '../type';

+ 1 - 2
src/views/disaster/hooks/index.ts

@@ -1,4 +1,3 @@
 import { useDeptInfoHook } from './deptInfo';
 import { useUserInfoHook } from './userInfo';
-import { useGroupInfoHook } from './groupInfo';
-export { useDeptInfoHook, useUserInfoHook, useGroupInfoHook };
+export { useDeptInfoHook, useUserInfoHook };