Browse Source

完成静态页面

chauncey 11 months ago
parent
commit
cab7e9b422

+ 1 - 0
src/views/disaster/disaster-control/PageDisposalManagement.vue

@@ -241,6 +241,7 @@
   const Task_RouterName = 'disaster-control-disposal-management-task-item';
   const Table_RouterName = 'disaster-control-disposal-management-item';
   const handleCreateDisposalManagement = (type: FORM_OPERATE_TYPE, taskName?: string) => {
+    console.log(type);
     const routerName = type === FORM_OPERATE_TYPE.TASK_ITEM ? Task_RouterName : Table_RouterName;
     router.push({
       name: routerName,

+ 9 - 6
src/views/disaster/disaster-control/src/components/CreateDisposalManagementItem.vue

@@ -30,9 +30,9 @@
   import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import {
-    DISPOSAL_MANAGEMENT_TASK_FROM_CONFIG,
+    DISPOSAL_MANAGEMENT_ITEM_FROM_CONFIG_CREATE,
     DISPOSAL_MANAGEMENT_TASK_FROM_DATA,
-    DISPOSAL_MANAGEMENT_TASK_FROM_RULES,
+    DISPOSAL_MANAGEMENT_ITEM_FROM_RULES_CREATE,
   } from '../config';
   import { onMounted, ref } from 'vue';
   import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
@@ -42,9 +42,11 @@
   import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
   import { getAllDepartments } from '@/api/auth/dept';
   import { getAllUserGroup } from '@/api/system/person-group';
+  import { useRoute } from 'vue-router';
 
   const { realname } = useUserInfoHook();
-
+  const route = useRoute();
+  const taskName = route.query.taskName as string;
   const basicFormRef = ref<InstanceType<typeof BasicForm>>();
 
   const firstLevelDepts = ref<DeptTree[]>([]);
@@ -52,9 +54,9 @@
 
   const { ruleFormConfig, ruleFormData, formRules, cloneRuleFormData, beforeRouteLeave } =
     useFormConfigHook<DisposalManagementRuleForm>(
-      DISPOSAL_MANAGEMENT_TASK_FROM_CONFIG,
+      DISPOSAL_MANAGEMENT_ITEM_FROM_CONFIG_CREATE,
       DISPOSAL_MANAGEMENT_TASK_FROM_DATA,
-      DISPOSAL_MANAGEMENT_TASK_FROM_RULES,
+      DISPOSAL_MANAGEMENT_ITEM_FROM_RULES_CREATE,
     );
 
   const handleValidate = async () => {
@@ -80,6 +82,7 @@
   });
   onMounted(() => {
     ruleFormData.realname = realname;
+    ruleFormData.taskName = taskName;
     getDeptList();
     getUserGroupList();
     cloneRuleFormData();
@@ -90,4 +93,4 @@
 <style scoped lang="scss">
   @use '@/views/disaster/style/info-container.scss' as *;
   @use '../style/item-common.scss' as *;
-</style>
+</style>

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

@@ -30,9 +30,9 @@
   import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import {
-    DISPOSAL_MANAGEMENT_ITEM_FROM_CONFIG_CREATE,
+    DISPOSAL_MANAGEMENT_TASK_FROM_CONFIG,
     DISPOSAL_MANAGEMENT_TASK_FROM_DATA,
-    DISPOSAL_MANAGEMENT_ITEM_FROM_RULES_CREATE,
+    DISPOSAL_MANAGEMENT_TASK_FROM_RULES,
   } from '../config';
   import { onMounted, ref } from 'vue';
   import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
@@ -42,11 +42,9 @@
   import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
   import { getAllDepartments } from '@/api/auth/dept';
   import { getAllUserGroup } from '@/api/system/person-group';
-  import { useRoute } from 'vue-router';
 
   const { realname } = useUserInfoHook();
-  const route = useRoute();
-  const taskName = route.query.taskName as string;
+
   const basicFormRef = ref<InstanceType<typeof BasicForm>>();
 
   const firstLevelDepts = ref<DeptTree[]>([]);
@@ -54,9 +52,9 @@
 
   const { ruleFormConfig, ruleFormData, formRules, cloneRuleFormData, beforeRouteLeave } =
     useFormConfigHook<DisposalManagementRuleForm>(
-      DISPOSAL_MANAGEMENT_ITEM_FROM_CONFIG_CREATE,
+      DISPOSAL_MANAGEMENT_TASK_FROM_CONFIG,
       DISPOSAL_MANAGEMENT_TASK_FROM_DATA,
-      DISPOSAL_MANAGEMENT_ITEM_FROM_RULES_CREATE,
+      DISPOSAL_MANAGEMENT_TASK_FROM_RULES,
     );
 
   const handleValidate = async () => {
@@ -82,7 +80,6 @@
   });
   onMounted(() => {
     ruleFormData.realname = realname;
-    ruleFormData.taskName = taskName;
     getDeptList();
     getUserGroupList();
     cloneRuleFormData();