|
|
@@ -3,136 +3,68 @@
|
|
|
<el-dialog :title="'培训登记'" :visible.sync="isShow" width="960px">
|
|
|
<div class="page-body">
|
|
|
<el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
|
|
|
- label-width="120px" label-prefix=":">
|
|
|
+ label-width="120px" label-prefix=":">
|
|
|
<el-row>
|
|
|
<!-- 培训主题 -->
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item prop="title" label="培训主题">
|
|
|
- <!-- <el-input
|
|
|
- v-model="formData.title"
|
|
|
- :maxlength="32"
|
|
|
- placeholder="请输入培训主题"
|
|
|
- clearable
|
|
|
- readonly
|
|
|
- disabled
|
|
|
- /> -->
|
|
|
+ <el-form-item prop="title" label="演练主题">
|
|
|
{{ formData.title }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item prop="orgName" label="培训机构">
|
|
|
+ <el-form-item prop="orgName" label="演练机构">
|
|
|
{{ formData.orgName }}
|
|
|
</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 v-if="formData.id" prop="dateTime" label="培训开始时间">
|
|
|
- <el-date-picker v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
|
|
|
- type="datetime" placeholder="选择日期" @change="startDateChanged">
|
|
|
+ <el-form-item prop="dateTime" label="演练时间">
|
|
|
+ <el-date-picker v-model="formData.drillTime" :picker-options="startDatepickerOptions"
|
|
|
+ type="datetime" placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item v-if="formData.id" prop="dateTime" label="培训结束时间">
|
|
|
- <el-date-picker v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions"
|
|
|
- type="datetime" placeholder="选择日期">
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item prop="content" label="演练地点">
|
|
|
+ <el-input v-model="formData.content" placeholder="请输入演练地点" :length="2000"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- 内容 -->
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item prop="content" label="内容">
|
|
|
- <k-textarea v-model="formData.content" placeholder="请输入内容" :length="2000" />
|
|
|
+ <el-form-item prop="type" label="演练项目">
|
|
|
+ <el-select v-model="formData.type" clearable placeholder="请选择演练项目">
|
|
|
+ <el-option
|
|
|
+ v-for="item in this.drillTypeOptions"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <!-- 主持人 -->
|
|
|
- <!-- <el-col :span="24">
|
|
|
- <el-form-item v-if="formData.id" prop="hostId" label="主持人">
|
|
|
- <k-select
|
|
|
- v-model="formData.hostId"
|
|
|
- url="/user/find/all"
|
|
|
- :params="{ orgId: formData.orgId }"
|
|
|
- placeholder="请选择主持人"
|
|
|
- ></k-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item v-if="formData.id" prop="recorderId" label="记录人">
|
|
|
- <k-select
|
|
|
- v-model="formData.recorderId"
|
|
|
- url="/user/find/all"
|
|
|
- :params="{ orgId: formData.orgId }"
|
|
|
- placeholder="请选择记录人"
|
|
|
- ></k-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
- <!-- 截止日期 -->
|
|
|
- <!-- <el-col :span="24">
|
|
|
- <el-form-item v-if="formData.id" prop="dateTime" label="培训时间">
|
|
|
- <el-date-picker
|
|
|
- v-model="formData.dateTime"
|
|
|
- type="datetime"
|
|
|
- placeholder="选择日期"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item prop="content" label="预设案由">
|
|
|
+ <k-textarea v-model="formData.content" placeholder="请输入预设案由" :length="2000"/>
|
|
|
</el-form-item>
|
|
|
- </el-col> -->
|
|
|
- <!-- 总结 -->
|
|
|
+ </el-col>
|
|
|
+
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item v-if="formData.id" prop="note" label="总结">
|
|
|
- <k-textarea v-model="formData.note" placeholder="请输入总结" :length="1000" />
|
|
|
+ <el-form-item v-if="formData.id" prop="note" label="演练情况">
|
|
|
+ <k-textarea v-model="formData.note" placeholder="请输入演练情况" :length="1000"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- 应到人数 -->
|
|
|
- <!-- <el-col :span="24">
|
|
|
- <el-form-item v-if="formData.id" prop="dueCount" label="应到人数">
|
|
|
- <el-input-number
|
|
|
- v-model="formData.dueCount"
|
|
|
- :min="0"
|
|
|
- placeholder="请输入应到人数"
|
|
|
- ></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
- <!-- 实到人数 -->
|
|
|
- <!-- <el-col :span="24">
|
|
|
- <el-form-item
|
|
|
- v-if="formData.id"
|
|
|
- prop="actualCount"
|
|
|
- label="实到人数"
|
|
|
- >
|
|
|
- <el-input-number
|
|
|
- v-model="formData.actualCount"
|
|
|
- :min="0"
|
|
|
- placeholder="请输入实到人数"
|
|
|
- ></el-input-number>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
- <el-col :span="24">
|
|
|
+
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item v-if="formData.id" 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="请选择参与人员"></k-select> -->
|
|
|
+ :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员"
|
|
|
+ @select="absenceUserSelectChanged"></k-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="24">
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item v-if="formData.id" 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>
|
|
|
@@ -142,14 +74,7 @@
|
|
|
<!-- <k-multi-upload v-model="formData.imageList" limit="4" byModule moduleName="edu-training" /> -->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!-- 上传文件 -->
|
|
|
- <!-- <el-col :span="24">
|
|
|
- <el-form-item prop="fileList" label="上传文件">
|
|
|
- <k-upload-file-multiple :disabled="!!id" v-model="formData.fileList" max="4"
|
|
|
- @uploadTriggerEvent="uploadTriggerEvent" byModule
|
|
|
- moduleName="edu-traning-perform"></k-upload-file-multiple>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
+
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
@@ -164,14 +89,17 @@
|
|
|
</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 {initList} from "@/api/core/drill/drillDictionary";
|
|
|
+import {getDrillTask} from "@/api/core/drill/drillTask";
|
|
|
+
|
|
|
export default {
|
|
|
- components: { KTextarea, KSelect, imgUpload },
|
|
|
+ components: {KTextarea, KSelect, imgUpload},
|
|
|
data() {
|
|
|
const params = this.$route.params;
|
|
|
return {
|
|
|
@@ -179,16 +107,10 @@ export default {
|
|
|
isShow: false,
|
|
|
formData: this.reset(),
|
|
|
formDataRules: {
|
|
|
- type: [{ required: true, message: "请选择类型" }],
|
|
|
- content: [{ required: true, message: "请输入内容" }],
|
|
|
- // hostId: [{ required: true, message: "请输入主持人" }],
|
|
|
- // recorderId: [{ required: true, message: "请输入记录人" }],
|
|
|
-
|
|
|
- trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
- trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
- note: [{ required: true, message: "请输入总结" }],
|
|
|
- // dueCount: [{ required: true, message: "请输入应到人数" }],
|
|
|
- // actualCount: [{ required: true, message: "请输入实到人数" }],
|
|
|
+ type: [{required: true, message: "请选择类型"}],
|
|
|
+ content: [{required: true, message: "请输入内容"}],
|
|
|
+ drillTime: [{required: true, message: "请输入培训时间"}],
|
|
|
+ note: [{required: true, message: "请输入总结"}],
|
|
|
},
|
|
|
startDatepickerOptions: {
|
|
|
disabledDate(time) {
|
|
|
@@ -198,6 +120,7 @@ export default {
|
|
|
endDatepickerOptions: {
|
|
|
disabledDate: this.endDisabledDate,
|
|
|
},
|
|
|
+ drillTypeOptions: [],
|
|
|
};
|
|
|
},
|
|
|
dicts: ['edu_type', 'edu_task_status'],
|
|
|
@@ -210,12 +133,7 @@ export default {
|
|
|
...mapMutations([]),
|
|
|
reset(other = {}) {
|
|
|
return {
|
|
|
- // hostId: null,
|
|
|
- // recorderId: null,
|
|
|
- trainingStartDateTime: null,
|
|
|
- trainingEndDateTime: null,
|
|
|
- // dueCount: null,
|
|
|
- // actualCount: null,
|
|
|
+ drillTime: null,
|
|
|
content: null,
|
|
|
title: null,
|
|
|
eduJobId: null,
|
|
|
@@ -224,19 +142,17 @@ export default {
|
|
|
absentList: [],
|
|
|
orgList: [],
|
|
|
fileList: [],
|
|
|
+
|
|
|
...other,
|
|
|
};
|
|
|
},
|
|
|
async refresh(id, other) {
|
|
|
- // this.formData = id
|
|
|
- // ? await this.$api.eduTraining.one(id)
|
|
|
- // : this.reset(other);
|
|
|
-
|
|
|
+ this.initDrillTypeOptions();
|
|
|
if (!id) {
|
|
|
this.reset(other);
|
|
|
return;
|
|
|
}
|
|
|
- getEduTask(id).then(response => {
|
|
|
+ getDrillTask(id).then(response => {
|
|
|
this.formData = response.data;
|
|
|
this.loading = false;
|
|
|
if (this.formData.imageList == null) {
|
|
|
@@ -250,17 +166,20 @@ export default {
|
|
|
element.type === 1
|
|
|
);
|
|
|
console.log("list1", list1)
|
|
|
- this.formData.absenceList = list1 ? list1.map((a) => { return a.userId; })
|
|
|
+ this.formData.absenceList = list1 ? list1.map((a) => {
|
|
|
+ return a.userId;
|
|
|
+ })
|
|
|
: [];
|
|
|
|
|
|
let list2 = this.formData.taskUserList.filter((element) =>
|
|
|
element.type === 2
|
|
|
);
|
|
|
console.log("list2", list2)
|
|
|
- this.formData.absentList = list2 ? list2.map((a) => { return a.userId; })
|
|
|
+ this.formData.absentList = list2 ? list2.map((a) => {
|
|
|
+ return a.userId;
|
|
|
+ })
|
|
|
: [];
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
this.formData.absenceList = [];
|
|
|
this.formData.absentList = [];
|
|
|
}
|
|
|
@@ -280,8 +199,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 => {
|
|
|
@@ -299,8 +217,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 => {
|
|
|
@@ -324,7 +241,7 @@ export default {
|
|
|
this.$message.error("参与人员与缺席人员重复，请重新选择!");
|
|
|
return;
|
|
|
}
|
|
|
- let request = { submitType: 1, ...this.formData };
|
|
|
+ let request = {submitType: 1, ...this.formData};
|
|
|
if (request.trainingStartDateTime)
|
|
|
request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
|
|
|
@@ -349,13 +266,13 @@ export default {
|
|
|
} else if (!this.validatePerson()) {
|
|
|
this.$message.error("参与人员与缺席人员重复，请重新选择!");
|
|
|
} else {
|
|
|
- let request = { submitType: 2, ...this.formData };
|
|
|
+ let request = {submitType: 2, ...this.formData};
|
|
|
if (request.trainingStartDateTime)
|
|
|
- request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
+ request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
+
|
|
|
+ if (request.trainingEndDateTime)
|
|
|
+ request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
|
|
|
- if (request.trainingEndDateTime)
|
|
|
- request.trainingEndDateTime = dayjs(request.trainingEndDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
-
|
|
|
recordEduTask(request).then((v) => {
|
|
|
this.$emit("success", this.formData);
|
|
|
this.onHide();
|
|
|
@@ -374,7 +291,8 @@ export default {
|
|
|
}
|
|
|
return true;
|
|
|
},
|
|
|
- uploadTriggerEvent(value) { },
|
|
|
+ uploadTriggerEvent(value) {
|
|
|
+ },
|
|
|
|
|
|
endDisabledDate(time) {
|
|
|
//小于开始日期禁止选择
|
|
|
@@ -388,14 +306,21 @@ 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)
|
|
|
}
|
|
|
},
|
|
|
+ initDrillTypeOptions() {
|
|
|
+ initList().then(response => {
|
|
|
+ this.drillTypeOptions = response.data;
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ mounted() {
|
|
|
+ this.initDrillTypeOptions()
|
|
|
},
|
|
|
- mounted() { },
|
|
|
};
|
|
|
</script>
|
|
|
|
jingyuanchao