Merge branch 'cc-dev' into 'dev'

去掉附件必填校验

See merge request product-group-fe/sfy-safety-group/sfy-safety!159

src/types/disaster-precaution/index.ts

@@ -24,6 +24,11 @@ interface BasicResponse {
 export interface TaskManagementListResponse extends BasicResponse {
   effectStatus: number;
   updatedAt: string;
+  executive: {
+    id: number;
+    realname: string;
+    staffNo: string;
+  }[];
 }
 
 export interface TaskExecutionListResponse extends BasicResponse {
@@ -34,7 +39,7 @@ export interface TaskExecutionListResponse extends BasicResponse {
 export interface TaskManagementItemResponse
   extends Omit<
     TaskManagementListResponse,
-    'deptName' | 'inspectType' | 'overdue' | 'effectStatus' | 'taskState' | 'updatedAt'
+    'deptName' | 'inspectType' | 'overdue' | 'effectStatus' | 'taskState' | 'updatedAt' | 'executive'
   > {
   inspectType: number | null;
   deptIdList: string[] | string;

src/views/disaster/disaster-precaution/PageTaskManagement.vue

@@ -78,6 +78,13 @@
             <template #taskStage="scope">
               <span>{{ TASK_STAGE_MAP[scope.row.taskState] }}</span>
             </template>
+            <template #executive="scope">
+              <div class="executive-container">
+                <p v-for="person in scope.row.executive" :key="person.id">
+                  {{ person.realname }}（{{person.staffNo}}）
+                </p>
+              </div>
+            </template>
             <template #action="scope">
               <div class="action-container--div">
                 <ActionButton

src/views/disaster/disaster-precaution/src/config/table.ts

@@ -81,6 +81,11 @@ export const TASK_MANAGEMENT_TABLE_COLUMNS: TableColumnProps[] = [
     width: '120px',
   },
   BASIC_TABLE_COLUMNS.TASK_STAGE,
+  {
+    label: '执行人员',
+    slot: 'executive',
+    minWidth: '300px'
+  },
   {
     prop: 'updatedAt',
     label: '创建时间',

src/views/emergency/emergency-plan/src/config/form.ts

@@ -113,7 +113,7 @@ export const PLAN_MANAGEMENT_FORM_DATA_EDIT = {
 };
 
 const BASIC_FORM_RULES = {
-  appendix: [{ required: true, message: '请上传预案文件',trigger: 'blur' }],
+  appendix: [{ required: true, message: '请上传预案文件', trigger: 'blur' }],
 };
 
 // 盘点任务表单规则
@@ -123,9 +123,6 @@ export const PLAN_MANAGEMENT_FORM_RULES = {
   eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
   deptId: [{ required: true, message: '请选择制定部门', trigger: 'blur' }],
   approvalTemplateId: [{ required: true, message: '请选择审批流程', trigger: 'change' }],
-  ...BASIC_FORM_RULES,
 };
 
-export const PLAN_MANAGEMENT_FORM_RULES_EDIT = {
-  ...BASIC_FORM_RULES,
-};
+export const PLAN_MANAGEMENT_FORM_RULES_EDIT = {};