Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

src/components/growthpath/GrowthFaceTaskManage.vue

@@ -558,16 +558,23 @@ function exportTaskStu() {
 const hasten = () => {
   if (!tableRef.value.data || !tableRef.value.data.length) {
     message.warning("当前课程没有可催促的学员");
-    return 
+    return;
   }
+  dialog({
+    content: "是否催促全部未完成学习任务的学员进行学习？",
+    ok: async () => {
       batchSendMessage({
         // courseId: props.datasource.courseId,//任务的Id
         courseId: data.value[coursePlanIndex.value].id, //任务的Id
         courseName: props.datasource.taskName, //任务的名称
         logo: 3, //项目或径的标识 1-项目 2-路径图 3面授课
         taskType: props.datasource.taskType, //催促的任务的类型
-  });
+      }).then((res) => {
+        console.log(res);
         message.success("催促成功");
+      });
+    },
+  });
 };
 
 function afterVisibleChange(bool) {

src/components/growthpath/GrowthOnlineManage.vue

@@ -158,6 +158,7 @@ import {
 } from "@/api/growthpath";
 
 import * as api from "@/api/index1";
+import dialog from "@/utils/dialog";
 import { TASK_TYPE } from "@/utils/constGrown";
 import PostSelectNew from "@/components/growthpath/PostSelect";
 import OfficeSelect from "@/components/growthpath/OfficeSelect";
@@ -480,6 +481,7 @@ export default {
         message.warning("当前学习任务没有可催促的学员");
         return;
       }
+
       var obj = {
         courseId: props.datasource.taskId
           ? props.datasource.taskId
@@ -489,6 +491,9 @@ export default {
         taskType: props.datasource.taskType, //催促的任务的类型
         growthId: props.datasource.growthId,
       };
+      dialog({
+        content: "是否催促全部未完成学习任务的学员进行学习？",
+        ok: async () => {
           batchSendMessage(obj)
             .then((res) => {
               console.log(res);
@@ -497,6 +502,8 @@ export default {
             .catch((err) => {
               console.log(err);
             });
+        },
+      });
     };
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);