Merge branch 'cc-dev' into 'dev'

按产品需求修改管理规定与通知

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

src/views/disaster/disaster-warning/src/components/CreateDefenseNoticeItem.vue

@@ -22,7 +22,7 @@
         </el-select>
       </template>
       <template #attachmentListRes>
-        <UploadFiles label="上传附件" ref="uploadFilesRef" @uploadSuccess="handleUploadSuccess" />
+        <UploadFiles label="上传文件" ref="uploadFilesRef" @uploadSuccess="handleUploadSuccess" />
       </template>
       <template #isPush>
         <el-radio-group v-model="ruleFormData.isPush">

src/views/disaster/disaster-warning/src/components/EditDefenseNoticeItem.vue

@@ -23,7 +23,7 @@
       </template>
       <template #attachmentListRes>
         <UploadFiles
-          label="上传附件"
+          label="上传文件"
           ref="uploadFilesRef"
           :fileList="ruleFormData.attachmentListRes"
           @uploadSuccess="handleUploadSuccess"

src/views/disaster/disaster-warning/src/components/ViewDefenseNoticeItem.vue

@@ -34,7 +34,7 @@
     <div v-html="defenseNoticeDetail?.content"></div>
   </section>
   <section class="attachment" v-if="defenseNoticeDetail?.attachmentListRes.length">
-    <span class="info-content" style="font-size: 14px">附件({{ defenseNoticeDetail?.attachmentListRes.length }})</span>
+    <span class="info-content" style="font-size: 14px">文件({{ defenseNoticeDetail?.attachmentListRes.length }})</span>
     &nbsp;
     <a @click="downloadAll">下载全部</a>
     <div class="attachment-list">

src/views/disaster/disaster-warning/src/config/form.ts

@@ -102,7 +102,7 @@ export const DEFENSE_NOTICE_FROM_CONFIG: FormConfig[] = [
     },
   },
   {
-    label: '附件：',
+    label: '文件：',
     prop: 'attachmentListRes',
     slot: 'attachmentListRes',
   },
@@ -138,13 +138,6 @@ export const DEFENSE_NOTICE_FROM_DATA = {
 
 // 通用表单规则
 const BASIC_FROM_RULES = {
-  disasterLevel: [
-    {
-      required: true,
-      message: '请选择灾害等级',
-      trigger: 'change',
-    },
-  ],
   userGroupList: [{ required: true, message: '请选择用户组', trigger: 'change' }],
   isPush: [{ required: true, message: '请选择是否推送', trigger: 'change' }],
 };
@@ -152,6 +145,13 @@ const BASIC_FROM_RULES = {
 // 预警信息表单规则
 export const WARNING_INFO_FROM_RULES = {
   disasterType: [{ required: true, message: '请选择预警类型', trigger: 'change' }],
+  disasterLevel: [
+    {
+      required: true,
+      message: '请选择灾害等级',
+      trigger: 'change',
+    },
+  ],
   ...BASIC_FROM_RULES,
   warnTime: [{ required: true, message: '请选择预警时间', trigger: 'change' }],
   source: [{ required: true, message: '请输入信息来源', trigger: 'blur' }],
@@ -159,8 +159,6 @@ export const WARNING_INFO_FROM_RULES = {
 
 // 防御通知表单规则
 export const DEFENSE_NOTICE_FROM_RULES = {
-  disasterType: [{ required: true, message: '请选择灾害类型', trigger: 'change' }],
   ...BASIC_FROM_RULES,
   title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-  content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 };