|
|
@@ -39,23 +39,23 @@
|
|
|
</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"
|
|
|
+ <el-form-item prop="dateTime" 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 v-if="formData.id" prop="dateTime" label="培训结束时间">
|
|
|
- <el-date-picker v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions"
|
|
|
+ <el-form-item prop="dateTime" label="培训结束时间">
|
|
|
+ <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions"
|
|
|
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" />
|
|
|
+ <el-form-item prop="content" label="培训内容">
|
|
|
+ <k-textarea v-model="formData.content" placeholder="请输入培训内容" :length="2000" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -94,39 +94,13 @@
|
|
|
<!-- 总结 -->
|
|
|
<el-col :span="24">
|
|
|
<el-form-item v-if="formData.id" prop="note" label="总结">
|
|
|
- <k-textarea v-model="formData.note" placeholder="请输入总结" :length="1000" />
|
|
|
+ <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="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-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">
|
|
|
@@ -139,17 +113,8 @@
|
|
|
<el-col :span="24">
|
|
|
<el-form-item prop="imageList" label="上传图片">
|
|
|
<imgUpload type="more" :value="formData.imageList" @input="imageListChanged"></imgUpload>
|
|
|
- <!-- <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>
|
|
|
@@ -181,14 +146,10 @@ export default {
|
|
|
formDataRules: {
|
|
|
type: [{ required: true, message: "请选择类型" }],
|
|
|
content: [{ required: true, message: "请输入内容" }],
|
|
|
- // hostId: [{ required: true, message: "请输入主持人" }],
|
|
|
- // recorderId: [{ required: true, message: "请输入记录人" }],
|
|
|
-
|
|
|
+ absenceList: [{ required: true, message: "请选择参与人员" }],
|
|
|
trainingStartDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
trainingEndDateTime: [{ required: true, message: "请输入培训时间" }],
|
|
|
note: [{ required: true, message: "请输入总结" }],
|
|
|
- // dueCount: [{ required: true, message: "请输入应到人数" }],
|
|
|
- // actualCount: [{ required: true, message: "请输入实到人数" }],
|
|
|
},
|
|
|
startDatepickerOptions: {
|
|
|
disabledDate(time) {
|
|
|
@@ -324,6 +285,11 @@ export default {
|
|
|
this.$message.error("参与人员与缺席人员重复，请重新选择!");
|
|
|
return;
|
|
|
}
|
|
|
+ //判断trainingStartDateTime大于trainingEndDateTime就返回
|
|
|
+ if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
|
|
|
+ this.$message.error("培训开始时间不能大于培训结束时间!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
let request = { submitType: 1, ...this.formData };
|
|
|
if (request.trainingStartDateTime)
|
|
|
request.trainingStartDateTime = dayjs(request.trainingStartDateTime).format('YYYY-MM-DD HH:mm:ss')
|
|
|
@@ -341,6 +307,11 @@ export default {
|
|
|
},
|
|
|
async onSubmit() {
|
|
|
await this.$refs.form.validate();
|
|
|
+ //判断trainingStartDateTime大于trainingEndDateTime就返回
|
|
|
+ if (dayjs(this.formData.trainingStartDateTime).isAfter(dayjs(this.formData.trainingEndDateTime))) {
|
|
|
+ this.$message.error("培训开始时间不能大于培训结束时间!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
console.log("onSubmit this.formData", this.formData)
|
|
|
let due = this.formData.dueCount;
|
|
|
let actual = this.formData.actualCount;
|
|
|
@@ -355,7 +326,7 @@ export default {
|
|
|
|
|
|
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();
|
jingyuanchao