教育培训代码提交

src/views/core/drill/task/dialog.perform.vue

@@ -51,13 +51,13 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item prop="absenceList" label="参与人员">
+              <el-form-item prop="absenceList" prop="absenceList" label="参与人员">
                 <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
                   :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员" @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item v-if="formData.id" label="缺席人员">
+              <el-form-item v-if="formData.id" prop="absentList" label="缺席人员">
                 <k-select :multiple="true" v-model="formData.absentList" url="/user/find/all"
                   :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged" placeholder="请选择缺席人员">
                 </k-select>
@@ -175,7 +175,7 @@ export default {
         }
         this.formData = response.data;
       });
-      console.log("getEduTask", this.formData);
+      console.log("getDrillTask", this.formData);
     },
     async show(id, other = {}) {
       this.id = id;
@@ -188,12 +188,12 @@ export default {
     },
     absentUserSelectChanged(list) {
       // 将类型为2的数据删除
-      if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(
+      if (this.formData.absentList) {
+        this.formData.absentList = this.formData.absentList.filter(
           (x) => x.type == 1
         );
       } else {
-        this.formData.taskUserList = [];
+        this.formData.absentList = [];
       }
       let tempList = list.map((x) => {
         return {
@@ -203,17 +203,17 @@ export default {
         };
       });
       if (!tempList) return;
-      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
-      console.log("absentUserSelectChanged", list, this.formData.taskUserList);
+      this.formData.absentList = this.formData.absentList.concat(tempList);
+      console.log("absentUserSelectChanged", list, this.formData.absentList);
     },
     absenceUserSelectChanged(list) {
       // 将类型为1的数据删除
-      if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(
+      if (this.formData.absenceList) {
+        this.formData.absenceList = this.formData.absenceList.filter(
           (x) => x.type == 2
         );
       } else {
-        this.formData.taskUserList = [];
+        this.formData.absenceList = [];
       }
       let tempList = list.map((x) => {
         return {
@@ -223,8 +223,8 @@ export default {
         };
       });
       if (!tempList) return;
-      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
-      console.log("absenceUserSelectChanged", list, this.formData.taskUserList);
+      this.formData.absenceList = this.formData.absenceList.concat(tempList);
+      console.log("absenceUserSelectChanged", list, this.formData.absenceList);
     },
     // 事件
     onHide() {

src/views/core/edu/task/dialog.perform.vue

@@ -308,7 +308,7 @@ export default {
 
       if (request.trainingEndDateTime)
         request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
-
+        request.taskUserList = [];
         recordEduTask(request).then((v) => {
           this.$emit("success", this.formData);
           this.onHide();

src/views/core/edu/task/index.vue

@@ -289,13 +289,11 @@ export default {
       }, `eduTask_${new Date().getTime()}.xlsx`)
     },
     canPerform(row) {
-      return  true;
       // debugger
       let flag = 0;
       if(row.status>0) return false;
       if(!row.taskRoleList)   return false;
       let isOver =this.isNotOverOrUnStart(row);
-      // console.log("isNotOverOrUnStart",isOver);
       row.taskRoleList.forEach((taskRole) => {
         this.$store.getters.roleList.forEach((role) => {
           if (taskRole.roleId == role.roleId) {
@@ -308,21 +306,10 @@ export default {
     isNotOverOrUnStart(row) {
       const currentTime = dayjs().startOf('day'); // 获取当前时间，并将时分秒部分设置为00时00分00秒
       const startDate = dayjs(row.startDate).startOf('day'); // 转换开始时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
-
       const endDate = dayjs(row.endDate).startOf('day'); // 转换结束时间为 Moment.js 对象，并将时分秒部分设置为00时00分00秒
-      // 判断开始时间和结束时间是否是同一天
-      //const isSameDay = startDate.isSame(endDate, 'day');
-      // console.log("isOverOrUnStart",currentTime,startDate,endDate);
-      // 如果是同一天，则判断当前时间是否在开始时间和结束时间之间（包括开始和结束时间）
-      // if (isSameDay) {
-      //   return dayjs(currentTime).isBetween(startDate, endDate, null, '[]');
-      // }
-
-      // 如果不是同一天，则判断当前时间是否早于开始时间或晚于结束时间
       return !(currentTime < startDate || currentTime > endDate);
     },
     async onDown(pdfUrl) {
-      // const data = await this.$api.eduTraining.predown(id);
       window.open(pdfUrl);
     },
   }