灾害处置

src/types/disaster-control/index.ts

@@ -25,6 +25,7 @@ export interface LossRecordTableQuery {
   handleDeptIds?: number[] | null;
   fixStatus?: string | null;
   isLoss?: number;
+  fixerId?: number;
 }
 
 interface BasicResponse {

src/views/disaster/disaster-control/PageDisposalRectification.vue

@@ -141,7 +141,7 @@
   import BasicTable from '@/components/BasicTable.vue';
   import InspectorSelect from '@/views/disaster/components/InspectorSelect.vue';
   import { nextTick, onMounted, reactive, ref } from 'vue';
-  import { getDisasterControlCollapseData, getLossRecordTableData, addFixer } from '@/api/disaster-control';
+  import { getReportTaskList, getLossRecordTableData, addFixer } from '@/api/disaster-control';
   import type { disasterReportTaskInfoListResponse } from '@/types/disaster-control';
   import { DEFAULT_PAGE_SIZE, DISASTER_CONTROL_PAGE_SIZE_CONFIG, FIX_STATUS } from './src/constant';
   import type {
@@ -165,13 +165,16 @@
   import type { PersonGroupItem } from '@/types/person-group/type';
   import { queryUserInfoByIds } from '@/api/system/person-group';
   import { ElMessage } from 'element-plus';
+  import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
+
+  const { id: userId } = useUserInfoHook();
 
   const { getPriority, getPriorityDict, priorityDice } = useDisasterControlHook();
   const collapseItemRef = ref<InstanceType<typeof CollapseItem>[]>([]);
 
   const searchData = reactive({
     priority: null,
-    fixStatus: '',
+    fixStatus: null,
     isLoss: 1,
   });
 
@@ -219,7 +222,7 @@
 
   const getDisposalData = async () => {
     collapseLoading.value = true;
-    const res = await getDisasterControlCollapseData({
+    const res = await getReportTaskList({
       pageNumber: currentPage.value,
       pageSize: pageSize.value,
       queryParam: {},
@@ -245,6 +248,7 @@
     tableConfig.loading = true;
     const res = await getLossRecordTableData({
       handleTaskIds: taskIds.value,
+      fixerId: userId,
       ...searchData,
     });
     collapseList.value.forEach((item) => {

src/views/disaster/disaster-control/src/components/EditLossReportItem.vue

@@ -40,8 +40,8 @@
       </template>
       <template #isAffectWork>
         <el-select v-model="ruleFormData.isAffectWork" placeholder="请选择是否影响正常工作">
-          <el-option label="是" value="1" />
-          <el-option label="否" value="0" />
+          <el-option label="是" :value="1" />
+          <el-option label="否" :value="0" />
         </el-select>
       </template>
       <template #lossAssessmentAmount>

src/views/disaster/disaster-control/src/components/LossRecord.vue

@@ -53,7 +53,7 @@
                     :content="scope.row.affectedItems"
                     placement="top-start"
                     effect="light"
-                    v-if="scope.row.affectedItems"
+                    v-if="scope.row.isLoss"
                   >
                     <div class="affected-items-container">
                       <span>{{ scope.row.affectedItems }}</span>
@@ -62,16 +62,16 @@
                   <span v-else>无损失</span>
                 </template>
                 <template #responsibleDeptName="scope">
-                  <span v-if="scope.row.responsibleDeptName">{{ scope.row.responsibleDeptName }}</span>
+                  <span v-if="scope.row.isLoss">{{ scope.row.responsibleDeptName }}</span>
                   <span v-else>--</span>
                 </template>
                 <template #priority="scope">
-                  <span v-if="scope.row.priority">{{ getPriority(scope.row.priority) }}</span>
+                  <span v-if="scope.row.isLoss">{{ getPriority(scope.row.priority) }}</span>
                   <span v-else>--</span>
                 </template>
                 <template #fixStatus="scope">
                   <div class="fix-status-container">
-                    <span v-if="scope.row.fixStatus">{{ getfixStatus(scope.row.fixStatus) }}</span>
+                    <span v-if="scope.row.isLoss">{{ getfixStatus(scope.row.fixStatus) }}</span>
                     <span v-else>--</span>
                   </div>
                 </template>
@@ -247,7 +247,6 @@
 
   const handleDelete = async (id: number) => {
     await deleteLossRecord(id);
-    await getDisposalData();
     await getDisposalTableData();
     ElMessage.success('删除成功');
   };