Merge branch 'cc-dev' into 'dev'

修复显示bug

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

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

@@ -189,7 +189,7 @@
     } else if (state === TASK_STAGE.COMPLETED) {
       await withdrawTaskApproval(id);
     }
-    ElMessage.success('撤回成功');
+    ElMessage.success('已取消发布');
     getTableData();
   };
   const getTableData = async () => {

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

@@ -228,7 +228,7 @@
   const handleWithdrawTask = async (id: number) => {
     await withdrawTaskManagementItem(id);
     getTableData();
-    ElMessage.success('撤回成功');
+    ElMessage.success('已取消发布');
   };
 
   const handleDeleteTask = async (id: number) => {

src/views/disaster/disaster-precaution/src/components/TemplateTableMerge.vue

@@ -79,6 +79,7 @@
               v-model:actual-situation="scope.row.actualSituation"
               @update:actual-situation="triggerValidate()"
               :disabled="operationType !== 'check'"
+              v-if="props.operationType !== 'template'"
             />
           </template>
         </el-table-column>

src/views/disaster/disaster-warning/PageDefenseNotice.vue

@@ -169,7 +169,7 @@
     });
   };
   const handlePublishDefenseNotice = async (id: number, effectState: number) => {
-    const message = effectState === ACTIVE_STATUS.ACTIVE ? '撤回成功' : '发布成功';
+    const message = effectState === ACTIVE_STATUS.ACTIVE ? '已取消发布' : '发布成功';
     const effectStateStatus = effectState === ACTIVE_STATUS.ACTIVE ? ACTIVE_STATUS.NOT_EFFECTIVE : ACTIVE_STATUS.ACTIVE;
     await publishDefenseNoticeItem({ id, effectState: effectStateStatus });
     await getTableData();

src/views/disaster/disaster-warning/PageWarningInfo.vue

@@ -180,7 +180,7 @@
     });
   };
   const handlePublishWarningInfo = async (id: number, effectState: number) => {
-    const message = effectState === ACTIVE_STATUS.ACTIVE ? '撤回成功' : '发布成功';
+    const message = effectState === ACTIVE_STATUS.ACTIVE ? '已取消发布' : '发布成功';
     const effectStateStatus = effectState === ACTIVE_STATUS.ACTIVE ? ACTIVE_STATUS.NOT_EFFECTIVE : ACTIVE_STATUS.ACTIVE;
     await publishWarningInfoItem({ id, effectState: effectStateStatus });
     await getTableData();