xiangyiyong 1 ano atrás
pai
commit
d91941a790

+ 20 - 4
src/views/lifeline/riskLinkageSystem/eventManage/eventUnfile/dialogFormHandle.vue

@@ -570,7 +570,10 @@
             </a-form-item>
 
             <a-tabs v-model:activeKey="activeKey">
-              <a-tab-pane key="1" :tab="`应急物资(${fourthData.materials.length})`">
+              <a-tab-pane
+                key="1"
+                :tab="`应急物资(${fourthData.materials.filter((item) => item.productId).length})`"
+              >
                 <div
                   v-for="(_, index) in fourthData.materials"
                   :key="index"
@@ -676,7 +679,12 @@
                   </a-row>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="2" :tab="`应急医疗队(${fourthData.eventEmergencies.length})`">
+              <a-tab-pane
+                key="2"
+                :tab="`应急医疗队(${
+                  fourthData.eventEmergencies.filter((item) => item.emergencyHospitalId).length
+                })`"
+              >
                 <div
                   v-for="(_, index) in fourthData.eventEmergencies"
                   :key="index"
@@ -756,7 +764,10 @@
                   </a-row>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="3" :tab="`应急救援队(${fourthData.rescues.length})`">
+              <a-tab-pane
+                key="3"
+                :tab="`应急救援队(${fourthData.rescues.filter((item) => item.companyId).length})`"
+              >
                 <div
                   v-for="(_, index) in fourthData.rescues"
                   :key="index"
@@ -846,7 +857,12 @@
                   </a-row>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="4" :tab="`抢险车辆(${fourthData.rescueCars.length})`">
+              <a-tab-pane
+                key="4"
+                :tab="`抢险车辆(${
+                  fourthData.rescueCars.filter((item) => item.companyId).carTypeCode
+                })`"
+              >
                 <div
                   v-for="(_, index) in fourthData.rescueCars"
                   :key="index"

+ 1 - 1
src/views/lifeline/riskLinkageSystem/eventManage/eventUnfile/index.vue

@@ -36,7 +36,7 @@
                 record.status != '4' &&
                 record.leaders.find((item) => item.companyId === organizationId)
                   ? true
-                  : false,
+                  : true,
             },
             {
               label: '详情',

+ 3 - 0
src/views/lifeline/riskMonitorSystem/monitorReport/reportHandle/dialogTableColumns.ts

@@ -85,6 +85,9 @@ export const thirdTableColums: BasicColumn[] = [
     dataIndex: 'dataSourceText',
     width: 120,
     format(text, record) {
+      if (text) {
+        return text;
+      }
       if (record.dataSource == 4) {
         return '系统推荐';
       }

+ 3 - 0
src/views/lifeline/riskMonitorSystem/monitorReport/reportTrace/config.data.ts

@@ -54,6 +54,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'leadingCompanyName',
     width: 120,
     sorter: true,
+    format(text, record) {
+      return record.companyName || text;
+    },
   },
   {
     title: '数据采集时间',