Merge remote-tracking branch 'origin/dev' into dev

src/views/emergencyCommandMap/RightSection/StartPlan.vue

@@ -259,11 +259,11 @@ const getPlanDocInfo = (plan_id) => {
 // 在组件挂载时尝试获取预案数据
 onMounted(() => {
   if (props.eventId) {
-    const response = await getEventDetail({ event_id: props.eventId });
-    const event_data = response.data;
-    planId.value = event_data.plan_id;
-
-    fetchPlanData();
+    getEventDetail({ event_id: props.eventId }).then((res)=>{
+      const event_data = res.data;
+      planId.value = event_data.plan_id;
+      fetchPlanData();
+    });
   }
 });
 

src/views/informationissue/informationApplication.vue

@@ -44,7 +44,7 @@
               <el-input v-model="formData.template_url" placeholder="请输入自定义详情页面链接地址" style="width: 468px !important" />
             </el-form-item>
             <el-form-item label="信息内容：" prop="content">
-              <el-input v-model="formData.content" :rows="4" type="textarea" placeholder="请输入信息内容" style="width: 468px !important"></el-input>
+              <el-input v-model="formData.content" :rows="6" type="textarea" placeholder="请输入信息内容" style="width: 468px !important"></el-input>
             </el-form-item>
             <el-form-item label="上传附件：" prop="attachs">
               <file-upload v-model="formData.attachs" :limit="4" :file-type="['pdf', 'doc', 'docx', 'jpg', 'png']" />

src/views/informationissue/informationApproval.vue

@@ -130,7 +130,7 @@
                   <div class="box1">
                     <h4>审批流程</h4>
                     <div>
-                      <p v-if="processingTime">已用时：{{ processingTime }}</p>
+                      <p v-if="processingTime">已用时：{{ formData.process_time }}</p>
                     </div>
                     <el-timeline style="width: 700px">
                       <template v-for="(item, index) in formData.examines" :key="index">
@@ -211,7 +211,8 @@ const formData = ref({
   processingTime: '',
   examines: [],
   attachs: [],
-  examine_attachs: []
+  examine_attachs: [],
+  process_time: ''
 });
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
@@ -289,6 +290,7 @@ const submitForm = () => {
         await submitExamine(form2.value);
         proxy?.$modal.msgSuccess('审批意见已提交');
         buttonDisabled.value = true;
+        fetchInformation();
       } finally {
         buttonLoading.value = false;
       }

src/views/informationissue/informationList.vue

@@ -142,7 +142,8 @@ const publishStatusOptions = reactive([
   { value: '1', label: '草稿' },
   { value: '2', label: '审批中' },
   { value: '3', label: '发布中' },
-  { value: '4', label: '已发布' }
+  { value: '4', label: '已发布' },
+  { value: '9', label: '取消发布' }
 ]);
 
 const approvalStatusOptions = reactive([

src/views/informationissue/informationView.vue

@@ -147,7 +147,7 @@
                   <div class="box1">
                     <h4>审批流程</h4>
                     <div>
-                      <p v-if="processingTime">已用时：{{ processingTime }}</p>
+                      <p v-if="processingTime">已用时：{{ formData.process_time }}</p>
                     </div>
                     <el-timeline style="width: 100%;">
                       <template v-for="(item, index) in formData.examines" :key="index">
@@ -234,7 +234,8 @@ const formData = ref({
   feedback_count: 0,
   unresponsive_count: 0,
   attachs: [],
-  examine_attachs: []
+  examine_attachs: [],
+  process_time: ''
 });
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;