|
|
@@ -3,7 +3,7 @@
|
|
|
<DialogCom :title="'培训登记'" :close="onHide" :visible.sync="isShow" width="960px">
|
|
|
<div class="page-body">
|
|
|
<el-form :model="formData" :rules="formDataRules" size="small" ref="perform" label-position="right"
|
|
|
- label-width="120px" label-prefix=":">
|
|
|
+ label-width="120px" label-prefix=":">
|
|
|
<el-row>
|
|
|
<!-- 培训主题 -->
|
|
|
<el-col :span="12">
|
|
|
@@ -25,62 +25,79 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!-- 类型 -->
|
|
|
-<!-- <el-col :span="24">
|
|
|
- <el-form-item prop="type" label="类型">
|
|
|
- <el-select v-model="formData.type" placeholder="请选择培训类型" clearable>
|
|
|
- <el-option v-for="dict in dict.type.edu_type" :key="dict.value" :label="dict.label"
|
|
|
- :value="parseInt(dict.value)" />
|
|
|
- </el-select>
|
|
|
- <!– <k-select-constant
|
|
|
- name="EduTrainingType"
|
|
|
- v-model="formData.type"
|
|
|
- placeholder="请选择类型"
|
|
|
- ></k-select-constant> –>
|
|
|
- </el-form-item>
|
|
|
- </el-col>-->
|
|
|
+ <!-- <el-col :span="24">
|
|
|
+ <el-form-item prop="type" label="类型">
|
|
|
+ <el-select v-model="formData.type" placeholder="请选择培训类型" clearable>
|
|
|
+ <el-option v-for="dict in dict.type.edu_type" :key="dict.value" :label="dict.label"
|
|
|
+ :value="parseInt(dict.value)" />
|
|
|
+ </el-select>
|
|
|
+ <!– <k-select-constant
|
|
|
+ name="EduTrainingType"
|
|
|
+ v-model="formData.type"
|
|
|
+ placeholder="请选择类型"
|
|
|
+ ></k-select-constant> –>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>-->
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item prop="trainingStartDateTime" label="培训开始时间">
|
|
|
- <el-date-picker required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
|
|
|
- type="datetime" placeholder="选择日期" @change="startDateChanged">
|
|
|
+ <el-form-item prop="trainingStartDateTime" label="培训开始时间">
|
|
|
+ <el-date-picker required v-model="formData.trainingStartDateTime"
|
|
|
+ :picker-options="startDatepickerOptions"
|
|
|
+ type="datetime" placeholder="选择日期" @change="startDateChanged">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item prop="trainingEndDateTime" label="培训结束时间">
|
|
|
- <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
|
|
|
- type="datetime" placeholder="选择日期">
|
|
|
+ <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions"
|
|
|
+ @change="endDateChanged"
|
|
|
+ type="datetime" placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!-- 内容 -->
|
|
|
<el-col :span="24">
|
|
|
<el-form-item prop="content" label="培训内容">
|
|
|
- <k-textarea v-model="formData.content" placeholder="请输入培训内容" :length="2000" />
|
|
|
+ <k-textarea v-model="formData.content" placeholder="请输入培训内容" :length="2000"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="24">
|
|
|
<el-form-item v-if="formData.id" prop="note" label="总结">
|
|
|
- <k-textarea v-model="formData.note" placeholder="请输入总结" :length="2000" />
|
|
|
+ <k-textarea v-model="formData.note" placeholder="请输入总结" :length="2000"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
|
|
|
<el-form-item v-if="formData.id" prop="absenceList" label="参与人员">
|
|
|
- <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
|
|
|
- :params="{ orgId: formData.orgId }" placeholder="请选择参与人员" @select="absenceUserSelectChanged"></k-select>
|
|
|
+ <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="24">
|
|
|
- <el-form-item v-if="formData.id" prop="absentList" 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="请选择缺席人员">
|
|
|
+ :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged"
|
|
|
+ placeholder="请选择缺席人员">
|
|
|
</k-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="资料附件" prop="fileList">
|
|
|
+ <K-file-upload ref="upload"
|
|
|
+ :defaultValue="formFileListDefualtValue"
|
|
|
+ v-model="formData.fileList"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="">
|
|
|
+ <el-button type="primary" @click="showSelectFile">从学习资料中选择</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item prop="imageList" label="上传图片">
|
|
|
- <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged"></imgUpload>
|
|
|
+ <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
|
|
|
+ @input="imageListChanged"></imgUpload>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -93,18 +110,26 @@
|
|
|
<el-button type="primary" @click="onSubmit">提交</el-button>
|
|
|
</div>
|
|
|
</DialogCom>
|
|
|
+ <DialogSelectFile
|
|
|
+ ref="DialogSelectFile"
|
|
|
+ :defaultSelect=defaultSelect
|
|
|
+ @select="fileSelected"
|
|
|
+ :orgId="this.$store.getters.orgId"
|
|
|
+ ></DialogSelectFile>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { mapState, mapMutations } from "vuex";
|
|
|
-import { getEduTask, recordEduTask } from "@/api/core/edu/eduTask";
|
|
|
+import {mapState, mapMutations} from "vuex";
|
|
|
+import {getEduTask, recordEduTask} from "@/api/core/edu/eduTask";
|
|
|
import dayjs from "dayjs";
|
|
|
import KTextarea from "@/components/common/textarea.vue";
|
|
|
import KSelect from "@/components/common/userselect.vue";
|
|
|
import imgUpload from "@/components/ImageUpload/index.vue";
|
|
|
+import KFileUpload from "@/components/K-FileUpload/index.vue";
|
|
|
+import DialogSelectFile from "../plan/dialog.select.file.vue";
|
|
|
export default {
|
|
|
- components: { KTextarea, KSelect, imgUpload },
|
|
|
+ components: {KTextarea, KSelect, imgUpload, KFileUpload,DialogSelectFile},
|
|
|
data() {
|
|
|
const params = this.$route.params;
|
|
|
return {
|
|
|
@@ -112,13 +137,13 @@ export default {
|
|
|
isShow: false,
|
|
|
formData: this.reset(),
|
|
|
formDataRules: {
|
|
|
- type: [{ required: true, message: "请选择类型" }],
|
|
|
- content: [{ required: true, message: "请输入内容" }],
|
|
|
- absenceList: [{ required: true, type: "array",message: "请选择参与人员"}],
|
|
|
- trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
- trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
- note: [{ required: true, message: "请输入总结" }],
|
|
|
- imageList: [{ required: true, message: "请上传图片" }],
|
|
|
+ type: [{required: true, message: "请选择类型"}],
|
|
|
+ content: [{required: true, message: "请输入内容"}],
|
|
|
+ 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) {
|
|
|
@@ -128,6 +153,8 @@ export default {
|
|
|
endDatepickerOptions: {
|
|
|
disabledDate: this.endDisabledDate,
|
|
|
},
|
|
|
+ formFileListDefualtValue: [],
|
|
|
+ defaultSelect: [],
|
|
|
};
|
|
|
},
|
|
|
dicts: ['edu_type', 'edu_task_status'],
|
|
|
@@ -166,7 +193,7 @@ export default {
|
|
|
this.reset(other);
|
|
|
return;
|
|
|
}
|
|
|
- let _this=this;
|
|
|
+ let _this = this;
|
|
|
getEduTask(id).then(response => {
|
|
|
this.loading = false;
|
|
|
// _this.formData = response.data;
|
|
|
@@ -175,17 +202,20 @@ export default {
|
|
|
element.type === 1
|
|
|
);
|
|
|
console.log("list1", list1)
|
|
|
- response.data.absenceList = list1 ? list1.map((a) => { return a.userId; })
|
|
|
+ response.data.absenceList = list1 ? list1.map((a) => {
|
|
|
+ return a.userId;
|
|
|
+ })
|
|
|
: [];
|
|
|
|
|
|
let list2 = response.data.taskUserList.filter((element) =>
|
|
|
element.type === 2
|
|
|
);
|
|
|
console.log("list2", list2)
|
|
|
- response.data.absentList = list2 ? list2.map((a) => { return a.userId; })
|
|
|
+ response.data.absentList = list2 ? list2.map((a) => {
|
|
|
+ return a.userId;
|
|
|
+ })
|
|
|
: [];
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
response.data.absenceList = [];
|
|
|
response.data.absentList = [];
|
|
|
}
|
|
|
@@ -197,6 +227,7 @@ export default {
|
|
|
response.data.fileList = [];
|
|
|
}
|
|
|
this.formData=response.data;
|
|
|
+ this.formFileListDefualtValue=response.data.fileList;
|
|
|
})
|
|
|
console.log("getEduTask", this.formData);
|
|
|
},
|
|
|
@@ -204,6 +235,7 @@ export default {
|
|
|
this.id = id;
|
|
|
await this.refresh(id, other);
|
|
|
this.isShow = true;
|
|
|
+ console.log("show", this.formData);
|
|
|
},
|
|
|
imageListChanged(list) {
|
|
|
this.formData.imageList = list;
|
|
|
@@ -214,8 +246,7 @@ export default {
|
|
|
// 将类型为2的数据删除
|
|
|
if (this.formData.taskUserList) {
|
|
|
this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 1);
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
this.formData.taskUserList = [];
|
|
|
}
|
|
|
let tempList = list.map(x => {
|
|
|
@@ -233,8 +264,7 @@ export default {
|
|
|
// 将类型为1的数据删除
|
|
|
if (this.formData.taskUserList) {
|
|
|
this.formData.taskUserList = this.formData.taskUserList.filter(x => x.type == 2);
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
this.formData.taskUserList = [];
|
|
|
}
|
|
|
let tempList = list.map(x => {
|
|
|
@@ -256,6 +286,7 @@ export default {
|
|
|
this.isShow = false;
|
|
|
this.formData = this.reset();
|
|
|
this.$refs["uploadimage"].clearFiles();
|
|
|
+ this.formFileListDefualtValue=[];
|
|
|
},
|
|
|
async onSave() {
|
|
|
if (!this.validatePerson()) {
|
|
|
@@ -267,7 +298,7 @@ export default {
|
|
|
this.$message.error("培训开始时间不能大于培训结束时间!");
|
|
|
return;
|
|
|
}
|
|
|
- let request = { submitType: 1, ...this.formData };
|
|
|
+ let request = {submitType: 1, ...this.formData};
|
|
|
delete request.absenceList;
|
|
|
delete request.absentList;
|
|
|
|
|
|
@@ -276,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();
|
|
|
@@ -286,31 +315,26 @@ 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.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 };
|
|
|
+ let request = {submitType: 2, ...this.formData};
|
|
|
delete request.absenceList;
|
|
|
delete request.absentList;
|
|
|
|
|
|
- if (request.trainingStartDateTime){
|
|
|
+ if (request.trainingStartDateTime) {
|
|
|
request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
}
|
|
|
|
|
|
- if (request.trainingEndDateTime){
|
|
|
+ if (request.trainingEndDateTime) {
|
|
|
request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
}
|
|
|
|
|
|
@@ -333,7 +357,8 @@ export default {
|
|
|
}
|
|
|
return true;
|
|
|
},
|
|
|
- uploadTriggerEvent(value) { },
|
|
|
+ uploadTriggerEvent(value) {
|
|
|
+ },
|
|
|
|
|
|
endDisabledDate(time) {
|
|
|
//小于开始日期禁止选择
|
|
|
@@ -347,21 +372,44 @@ export default {
|
|
|
|
|
|
},
|
|
|
startDateChanged(time) {
|
|
|
- console.log("startDateChanged",time,this.formData.trainingStartDateTime ,this.formData.trainingEndDateTime)
|
|
|
+ console.log("startDateChanged", time, this.formData.trainingStartDateTime, this.formData.trainingEndDateTime)
|
|
|
if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
|
|
|
this.formData.trainingEndDateTime = this.formData.trainingStartDateTime;
|
|
|
- console.log("trainingEndDateTime",this.formData.trainingEndDateTime)
|
|
|
+ console.log("trainingEndDateTime", this.formData.trainingEndDateTime)
|
|
|
}
|
|
|
},
|
|
|
endDateChanged(time) {
|
|
|
- console.log("startDateChanged",time,this.formData.trainingStartDateTime ,this.formData.trainingEndDateTime)
|
|
|
+ console.log("startDateChanged", time, this.formData.trainingStartDateTime, this.formData.trainingEndDateTime)
|
|
|
if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
|
|
|
this.formData.trainingStartDateTime = this.formData.trainingEndDateTime;
|
|
|
- console.log("trainingEndDateTime",this.formData.trainingEndDateTime)
|
|
|
+ console.log("trainingEndDateTime", this.formData.trainingEndDateTime)
|
|
|
+ }
|
|
|
+ },
|
|
|
+ fileSelected(list) {
|
|
|
+
|
|
|
+ if (!list) return;
|
|
|
+ let tempArry = [];
|
|
|
+ list.forEach(x => {
|
|
|
+ tempArry = tempArry.concat(x.fileList);
|
|
|
+ })
|
|
|
+ console.log("tempArry", tempArry, this.formData.fileList);
|
|
|
+ if (this.formData.fileList) {
|
|
|
+ console.log("12312312121212121212121")
|
|
|
+ this.formFileListDefualtValue = this.formData.fileList.concat(tempArry);
|
|
|
+ this.formData.fileList = this.formData.fileList.concat(tempArry);
|
|
|
+ console.log("this.formFileListDefualtValue", this.formFileListDefualtValue)
|
|
|
+ } else {
|
|
|
+ this.formFileListDefualtValue = tempArry;
|
|
|
}
|
|
|
},
|
|
|
+ showSelectFile() {
|
|
|
+ this.$refs["DialogSelectFile"].show();
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+ mounted() {
|
|
|
},
|
|
|
- mounted() { },
|
|
|
};
|
|
|
</script>
|
|
|
|
jiawuxian