演练bug修改

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

@@ -202,6 +202,46 @@ export default {
       console.log("imageListChanged", this.formData.imageList);
     },
     absentUserSelectChanged(list) {
+      console.log(list);
+      // 将类型为2的数据删除
+      if (this.formData.taskUserList) {
+        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
+      } else {
+        this.formData.taskUserList = [];
+      }
+      let tempList = list.map(x => {
+        return {
+          userId: x.id,
+          userName: x.name,
+          type: 2
+        }
+      })
+      if (!tempList) return;
+      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      console.log("absentUserSelectChanged", list, this.formData.taskUserList);
+    },
+    absenceUserSelectChanged(list) {
+      // 将类型为1的数据删除
+      if (this.formData.taskUserList) {
+        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 2);
+      } else {
+        this.formData.taskUserList = [];
+      }
+      let tempList = list.map(x => {
+        return {
+          userId: x.id,
+          userName: x.name,
+          type: 1
+        }
+      });
+      if (!tempList) return;
+      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      // console.log("absenceUserSelectChanged", list, this.formData.taskUserList,this.formData.absenceList);
+      // this.formData.absenceList=list.map(item=>item.id);
+
+      // console.log("absenceUserSelectChanged", list, this.formData.taskUserList,this.formData.absenceList);
+    },
+    /*absentUserSelectChanged(list) {
       // 将类型为2的数据删除
       if (this.formData.absentList) {
         this.formData.absentList = this.formData.absentList.filter(
@@ -220,8 +260,8 @@ export default {
       if (!tempList) return;
       this.formData.absentList = this.formData.absentList.concat(tempList);
       console.log("absentUserSelectChanged", list, this.formData.absentList);
-    },
-    absenceUserSelectChanged(list) {
+    },*/
+    /*absenceUserSelectChanged(list) {
       // 将类型为1的数据删除
       if (this.formData.absenceList) {
         this.formData.absenceList = this.formData.absenceList.filter(
@@ -240,7 +280,7 @@ export default {
       if (!tempList) return;
       this.formData.absenceList = this.formData.absenceList.concat(tempList);
       console.log("absenceUserSelectChanged", list, this.formData.absenceList);
-    },
+    },*/
     // 事件
     onHide() {
       this.isShow = false;
@@ -252,28 +292,50 @@ export default {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
         return;
       }
+      //判断trainingStartDateTime大于trainingEndDateTime就返回
+      if (dayjs(this.formData.drillStartTime).isAfter(dayjs(this.formData.drillEndTime))) {
+        this.$message.error("演练开始时间不能大于演练结束时间!");
+        return;
+      }
       let request = {submitType: 1, ...this.formData};
+      delete request.absenceList;
+      delete request.absentList;
+
       if (request.drillStartTime)
         request.drillStartTime = dayjs(request.drillStartTime).format("YYYY-MM-DD HH:mm:ss");
+
       if (request.drillEndTime)
         request.drillEndTime = dayjs(request.drillEndTime).format("YYYY-MM-DD HH:mm:ss");
+
       recordDrillTask(request).then((v) => {
         this.$emit("success", this.formData);
         this.onHide();
-        this.$modal.msgSuccess("培训登记暂存成功");
+        this.$modal.msgSuccess("演练登记暂存成功");
       });
     },
     async onSubmit() {
       await this.$refs.form.validate();
-      console.log("onSubmit this.formData", this.formData);
-      if (!this.validatePerson()) {
+      if (dayjs(this.formData.drillStartTime).isAfter(dayjs(this.formData.drillEndTime))) {
+        this.$message.error("培训开始时间不能大于培训结束时间!");
+        return;
+      }
+      this.formData.taskUserList = this.formData.taskUserList ? this.formData.taskUserList : []
+      if (this.formData.taskUserList.length == 0 || this.formData.taskUserList.filter(item => item.type == 1).length == 0) {
+        this.$message.error("参与人员不能为空，请重新选择!");
+      } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
       } else {
         let request = {submitType: 2, ...this.formData};
-        if (request.drillStartTime)
+        delete request.absenceList;
+        delete request.absentList;
+
+        if (request.drillStartTime){
           request.drillStartTime = dayjs(request.drillStartTime).format("YYYY-MM-DD HH:mm:ss");
-        if (request.drillEndTime)
+        }
+
+        if (request.drillEndTime){
           request.drillEndTime = dayjs(request.drillEndTime).format("YYYY-MM-DD HH:mm:ss");
+        }
 
         recordDrillTask(request).then((v) => {
           this.$emit("success", this.formData);

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

@@ -307,9 +307,7 @@ export default {
 
       if (request.trainingEndDateTime)
         request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
-      // if(request.imageList)
-      //   request.imageList=request.imageList.split(',').map(x=>{return x;});
-      // request.taskUserList = [];
+
       recordEduTask(request).then((v) => {
         this.$emit("success", this.formData);
         this.onHide();
@@ -317,16 +315,11 @@ export default {
       });
     },
     async onSubmit() {
-      //console.log("onSubmit this.formData", this.formData)
       await this.$refs.perform.validate();
-      //判断trainingStartDateTime大于trainingEndDateTime就返回
       if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
         this.$message.error("培训开始时间不能大于培训结束时间!");
         return;
       }
-      // this.formData.taskUserList=[];
-      console.log("onSubmit this.formData", this.formData)
-      console.log(this.formData.taskUserList);
       this.formData.taskUserList = this.formData.taskUserList ? this.formData.taskUserList : []
       if (this.formData.taskUserList.length == 0 || this.formData.taskUserList.filter(item => item.type == 1).length == 0) {
         this.$message.error("参与人员不能为空，请重新选择!");