Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

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

@@ -2,7 +2,7 @@
   <div class="edu-training-edit">
     <DialogCom :title="'培训登记'" :close="onHide" :visible.sync="isShow" width="960px">
       <div class="page-body">
-        <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
+        <el-form :model="formData" :rules="formDataRules" size="small" ref="perform" label-position="right"
           label-width="120px" label-prefix=":">
           <el-row>
             <!-- 培训主题 -->
@@ -114,7 +114,7 @@ export default {
       formDataRules: {
         type: [{ required: true, message: "请选择类型" }],
         content: [{ required: true, message: "请输入内容" }],
-        absenceList: [{ required: true, message: "请选择参与人员" }],
+        absenceList: [{ required: true, type: "array",message: "请选择参与人员",trigger: ['blur','change'] }],
         trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
         trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
         note: [{ required: true, message: "请输入总结" }],
@@ -165,34 +165,37 @@ export default {
         this.reset(other);
         return;
       }
+      let _this=this;
       getEduTask(id).then(response => {
-        this.formData = response.data;
         this.loading = false;
-        if (this.formData.imageList == null) {
-          this.formData.imageList = "";
-        }
-        if (this.formData.fileList == null) {
-          this.formData.fileList = [];
-        }
-        if (this.formData.taskUserList) {
-          let list1 = this.formData.taskUserList.filter((element) =>
+        // _this.formData = response.data;
+        if (response.data.taskUserList) {
+          let list1 = response.data.taskUserList.filter((element) =>
             element.type === 1
           );
           console.log("list1", list1)
-          this.formData.absenceList = list1 ? list1.map((a) => { return a.userId; })
+          response.data.absenceList = list1 ? list1.map((a) => { return a.userId; })
             : [];
 
-          let list2 = this.formData.taskUserList.filter((element) =>
+          let list2 = response.data.taskUserList.filter((element) =>
             element.type === 2
           );
           console.log("list2", list2)
-          this.formData.absentList = list2 ? list2.map((a) => { return a.userId; })
+          response.data.absentList = list2 ? list2.map((a) => { return a.userId; })
             : [];
         }
         else {
-          this.formData.absenceList = [];
-          this.formData.absentList = [];
+          response.data.absenceList = [];
+          response.data.absentList = [];
+        }
+        
+        if (response.data.imageList == null) {
+          response.data.imageList = "";
+        }
+        if (response.data.fileList == null) {
+          response.data.fileList = [];
         }
+        this.formData=response.data;
       })
       console.log("getEduTask", this.formData);
     },
@@ -278,7 +281,8 @@ export default {
       });
     },
     async onSubmit() {
-      await this.$refs.form.validate();
+      //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("培训开始时间不能大于培训结束时间!");