Procházet zdrojové kódy

fix: 修改应急部分报错

ai0197 před 1 měsícem
rodič
revize
d8e824c2fe

+ 2 - 2
src/types/emergency-plan/index.ts

@@ -4,7 +4,7 @@ export interface PlanEmergencyListQuery {
   planName?: string;
   planType?: string;
   eventType?: string;
-  taskSite?: string;
+  taskSite?: number;
   status?: number;
 }
 
@@ -22,7 +22,7 @@ interface BasicListResponse {
 }
 
 export interface PlanEmergencyListResponse extends BasicListResponse {
-  taskSite: string | null;
+  taskSite: number | null;
   isDisabled: number;
   status: number;
   approvalTemplateId: number;

+ 4 - 1
src/views/emergency/emergency-plan/PageManagement.vue

@@ -53,6 +53,9 @@
           <template #eventType="scope">
             <span>{{ getEmergencyEvent(scope.row.eventType) }}</span>
           </template>
+          <template #taskSite="scope">
+            <span>{{ TASK_SITE_MAP[scope.row.taskSite] }}</span>
+          </template>
           <template #status="scope">
             <span
               :class="
@@ -157,7 +160,7 @@
     APPROVAL_TYPE_MAP,
     APPROVAL_STATUS_MAP,
     APPROVAL_STATUS,
-    APPROVAL_TYPE,
+    TASK_SITE_MAP,
   } from './src/constant';
 
   const router = useRouter();

+ 2 - 7
src/views/emergency/emergency-plan/src/components/AddManagementDetail.vue

@@ -31,12 +31,7 @@
       </template>
       <template #taskSite>
         <el-select v-model="ruleFormData.taskSite" placeholder="请选择作业场所">
-          <el-option
-            v-for="item in PROFESSIONAL_TEST_SITE_DICE"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in TASK_SITE_DICE" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </template>
       <template #approvalTemplateId>
@@ -66,7 +61,7 @@
   import type { AddEmergencyPlanForm } from '@/types/emergency-plan';
   import type { FileItem } from '@/components/UploadFiles/types.ts';
   import { PLAN_MANAGEMENT_FORM_CONFIG, PLAN_MANAGEMENT_FORM_DATA, PLAN_MANAGEMENT_FORM_RULES } from '../config';
-  import { PROFESSIONAL_TEST_SITE_DICE } from '../constant';
+  import { TASK_SITE_DICE } from '../constant';
 
   const formRef = ref();
   const cascaderRef = ref();

+ 5 - 3
src/views/emergency/emergency-plan/src/config/search.ts

@@ -1,5 +1,5 @@
 import type { SearchConfig } from '@/types/basic-search';
-import { EMERGENCY_PLAN_STATUS_OPTIONS, APPROVAL_STATUS_OPTIONS } from '../constant';
+import { EMERGENCY_PLAN_STATUS_OPTIONS, APPROVAL_STATUS_OPTIONS, TASK_SITE_DICE } from '../constant';
 
 export const EMERGENCY_PLAN_MANAGEMENT_SEARCH_CONFIG: SearchConfig[] = [
   {
@@ -23,9 +23,11 @@ export const EMERGENCY_PLAN_MANAGEMENT_SEARCH_CONFIG: SearchConfig[] = [
   {
     label: '作业场所:',
     prop: 'taskSite',
-    component: 'ElInput',
+    component: 'ElSelect',
+    selectOptions: TASK_SITE_DICE,
     componentProps: {
-      placeholder: '请输入作业场所',
+      placeholder: '请选择作业场所',
+      filterable: true,
     },
   },
   {

+ 2 - 2
src/views/emergency/emergency-plan/src/config/table.ts

@@ -66,7 +66,7 @@ export const EMERGENCY_PLAN_MANAGEMENT_TABLE_COLUMNS: TableColumnProps[] = [
   BASIC_TABLE_COLUMNS.DEPT_NAME,
   {
     label: '作业场所',
-    prop: 'taskSite',
+    slot: 'taskSite',
     minWidth: '160px',
   },
   {
@@ -77,7 +77,7 @@ export const EMERGENCY_PLAN_MANAGEMENT_TABLE_COLUMNS: TableColumnProps[] = [
   {
     label: '启停',
     slot: 'isDisabled',
-    minWidth: '60px',
+    minWidth: '100px',
     align: 'center',
   },
   BASIC_TABLE_COLUMNS.ACTION,

+ 31 - 9
src/views/emergency/emergency-plan/src/constant.ts

@@ -84,37 +84,59 @@ export const APPROVAL_STATUS_OPTIONS = [
   },
 ];
 
-export const PROFESSIONAL_TEST_SITE_DICE = [
+export enum TASK_SITE {
+  WAREHOUSE = 1,
+  ACCOMMODATION,
+  OFFICE,
+  SERVICE,
+  EXPERIMENT,
+  SPORTS,
+  CONSTRUCTION,
+  OHTER,
+}
+
+export const TASK_SITE_MAP = {
+  [TASK_SITE.WAREHOUSE]: '仓储',
+  [TASK_SITE.ACCOMMODATION]: '住宿',
+  [TASK_SITE.OFFICE]: '办公',
+  [TASK_SITE.SERVICE]: '服务',
+  [TASK_SITE.EXPERIMENT]: '试验',
+  [TASK_SITE.SPORTS]: '文体活动',
+  [TASK_SITE.CONSTRUCTION]: '施工',
+  [TASK_SITE.OHTER]: '其他',
+};
+
+export const TASK_SITE_DICE = [
   {
     label: '仓储',
-    value: '仓储',
+    value: TASK_SITE.WAREHOUSE,
   },
   {
     label: '住宿',
-    value: '住宿',
+    value: TASK_SITE.ACCOMMODATION,
   },
   {
     label: '办公',
-    value: '办公',
+    value: TASK_SITE.OFFICE,
   },
   {
     label: '服务',
-    value: '服务',
+    value: TASK_SITE.SERVICE,
   },
   {
     label: '试验',
-    value: '试验',
+    value: TASK_SITE.EXPERIMENT,
   },
   {
     label: '文体活动',
-    value: '文体活动',
+    value: TASK_SITE.SPORTS,
   },
   {
     label: '施工',
-    value: '施工',
+    value: TASK_SITE.CONSTRUCTION,
   },
   {
     label: '其他',
-    value: '其他',
+    value: TASK_SITE.OHTER,
   },
 ];