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

@@ -65,14 +65,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-             
-              <el-form-item v-if="formData.id"   label="参与人员">
-                <k-select :multiple="true" :value="formData.absenceList" url="/user/find/all"
+
+              <el-form-item v-if="formData.id" prop="absenceList" label="参与人员">
+                <k-select :multiple="true" :value="formData.absenceList"  url="/user/find/all"
                   :params="{ orgId: formData.orgId }" placeholder="请选择参与人员" @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <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>
@@ -114,10 +114,11 @@ export default {
       formDataRules: {
         type: [{ required: true, message: "请选择类型" }],
         content: [{ required: true, message: "请输入内容" }],
-        absenceList: [{ required: true, type: "array",message: "请选择参与人员",trigger: ['blur','change'] }],
+        absenceList: [{ required: true, type: "array",message: "请选择参与人员"}],
         trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
         trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
         note: [{ required: true, message: "请输入总结" }],
+        imageList: [{ required: true, message: "请上传图片" }],
       },
       startDatepickerOptions: {
         disabledDate(time) {
@@ -188,7 +189,7 @@ export default {
           response.data.absenceList = [];
           response.data.absentList = [];
         }
-        
+
         if (response.data.imageList == null) {
           response.data.imageList = "";
         }
@@ -211,11 +212,11 @@ export default {
     absentUserSelectChanged(list) {
       console.log(list);
       // 将类型为2的数据删除
-      if (this.formData.taskUserList) {
-        this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
+      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 {
@@ -225,16 +226,16 @@ 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(x => x.type == 2);
+      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 {
@@ -244,10 +245,10 @@ export default {
         }
       });
       if (!tempList) return;
-      this.formData.taskUserList = this.formData.taskUserList.concat(tempList);
+      this.formData.absenceList = this.formData.absenceList.concat(tempList);
       // this.formData.absenceList=list.map(item=>item.id)
-      
-      console.log("absenceUserSelectChanged", list, this.formData.taskUserList);
+
+      console.log("absenceUserSelectChanged", list, this.formData.absenceList);
     },
     // 事件
     onHide() {
@@ -273,7 +274,7 @@ export default {
         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();
@@ -288,6 +289,7 @@ export default {
         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:[]
@@ -295,7 +297,7 @@ export default {
       let actual = this.formData.actualCount;
       if (actual > due) {
         this.$message.error("实到人数不能大于应到人数!");
-      }else if(this.formData.taskUserList.length==0||this.formData.taskUserList.filter(item=>item.type==1).length==0){
+      }else if(this.formData.absenceList.length==0||this.formData.absenceList.filter(item=>item.type==1).length==0){
         this.$message.error("参与人员不能为空，请重新选择!");
       } else if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");

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

@@ -24,7 +24,7 @@
           placeholder="请选择开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="培训类型" prop="type">
+<!--      <el-form-item label="培训类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择培训类型" clearable>
             <el-option
               v-for="dict in dict.type.edu_type"
@@ -33,7 +33,7 @@
               :value="dict.value"
             />
           </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="培训状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择培训状态" clearable>
             <el-option
@@ -68,11 +68,11 @@
           </template>
       </el-table-column>
       <el-table-column label="培训主题" width="200" align="left" prop="title" />
-      <el-table-column label="培训类型" width="180" align="center"  >
+<!--      <el-table-column label="培训类型" width="180" align="center"  >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_type" :value="scope.row.type"/>
           </template>
-      </el-table-column>
+      </el-table-column>-->
 
       <el-table-column label="主持人" width="140" align="center" prop="hostName" />
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
@@ -289,6 +289,7 @@ export default {
       }, `eduTask_${new Date().getTime()}.xlsx`)
     },
     canPerform(row) {
+      return  true;
       // debugger
       let flag = 0;
       if(row.status>0) return false;