Merge branch 'cc-dev' into 'dev'

取消预警信息-发布内容500字的限制

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

src/styles/custom-component.scss

@@ -97,3 +97,10 @@ $message-box-content-padding--icon: 36px;
   --el-color-primary: #fff;
   --el-color-primary-light-9: #1890ff;
 }
+
+.el-scrollbar--custom{
+  max-width: 520px;
+  .el-scrollbar{
+    max-width: 515px;
+  }
+}

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

@@ -62,9 +62,7 @@ export const WARNING_INFO_FROM_CONFIG: FormConfig[] = [
     componentProps: {
       placeholder: '请输入发布内容',
       type: 'textarea',
-      rows: 5,
-      maxlength: 500,
-      showWordLimit: true,
+      rows: 5
     },
   },
   BASIC_FROM_CONFIG.IS_PUSH,

src/views/emergency/emergency-plan/src/components/AddManagementDetail.vue

@@ -23,13 +23,22 @@
           :props="cascaderProp"
           :show-all-levels="false"
           placeholder="请选择制定部门"
+          filterable
         />
       </template>
       <template #approvalTemplateId>
-        <el-select v-model="ruleFormData.approvalTemplateId" placeholder="请选择审批流程" filterable>
+        <el-select
+          v-model="ruleFormData.approvalTemplateId"
+          placeholder="请选择审批流程"
+          filterable
+          popper-class="el-scrollbar--custom"
+        >
           <el-option v-for="item in approvalList" :key="item.id" :label="item.templateName" :value="item.id" />
         </el-select>
       </template>
+      <template #appendix>
+        <UploadFiles label="上传附件" :maxCount="1" />
+      </template>
     </BasicForm>
   </div>
 </template>
@@ -37,6 +46,7 @@
 <script setup lang="ts">
   import { ref, onMounted } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
+  import UploadFiles from '@/views/disaster/components/UploadFiles.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
   import { useEmergencyHook } from '@/views/emergency/src/hoos';
   import { useEmergencyPlanHook } from '../hook';
@@ -44,7 +54,7 @@
   import { PLAN_MANAGEMENT_FROM_CONFIG, PLAN_MANAGEMENT_FROM_DATA, PLAN_MANAGEMENT_FROM_RULES } from '../config';
 
   const formRef = ref();
-  const cascaderProp = { expandTrigger: 'hover', emitPath: false, value: 'id', label: 'deptName' };
+  const cascaderProp = { checkStrictly: true, expandTrigger: 'hover', value: 'id', label: 'deptName' };
   const { ruleFormConfig, ruleFormData, formRules, cloneRuleFormData, beforeRouteLeave } =
     useFormConfigHook<AddEmergencyPlanForm>(
       PLAN_MANAGEMENT_FROM_CONFIG,

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

@@ -34,7 +34,7 @@ export const PLAN_MANAGEMENT_FROM_CONFIG: FormConfig[] = [
     slot: 'approvalTemplateId',
   },
   {
-    label: '上传附件：',
+    label: '预案文件：',
     prop: 'appendix',
     slot: 'appendix',
   },

src/views/emergency/src/hoos.ts

@@ -22,7 +22,8 @@ export const useEmergencyHook = () => {
   // 部门树
   const deptTree = ref<DeptTree[]>();
   const getDeptTreeData = async () => {
-    deptTree.value = await getAllDepartments();
+    const res = await getAllDepartments();
+    deptTree.value = res[0].children;
   };
   // 获取所有审批流程
   const approvalList = ref<ApprovalInstanceType[]>();