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

src/views/core/drill/plan/index.vue

@@ -123,8 +123,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="演练类型" prop="type">
-              <el-select style="width: 100%" v-model="form.type" placeholder="请选择演练类型"  @change="drillTypeSelected()">
+            <el-form-item label="演练类型" prop="category">
+              <el-select style="width: 100%" v-model="form.category" placeholder="请选择演练类型"  @change="drillTypeSelected()">
                 <el-option v-for="dict in dict.type.core_drill_category" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
@@ -328,9 +328,9 @@ export default {
         execTimes: [
           {required: true, message: "任务次数不能为空", trigger: "blur"}
         ],
-        // planStatus: [
-        //   {required: true, message: "计划状态不能为空", trigger: "blur"}
-        // ],
+        category: [
+           {required: true, message: "演练类型不能为空", trigger: "blur"}
+         ],
         execOrgType: [
           {required: true, message: "机构类型不能为空", trigger: "blur"}
         ],
@@ -432,10 +432,15 @@ export default {
       // this.form.planExecOrgIdList = [];
     },
     showBuildTaskNow(){
+      //如果是新增的情况下
       if (!this.form.id){
         return this.form.planCycle != 0
       }else {
-        return this.form.planCycle != 0&&this.form.issue == 0
+        //如果是编辑的情况下，判断是否是标准计划
+        if (this.form.standard==1){
+          return this.form.planCycle != 0&&this.form.issue == 0
+        }
+        return false;
       }
     },
     /** 查询机构树数据 */
@@ -470,6 +475,8 @@ export default {
         remark: null,
         planRoleId: null,
         fileList: null,
+        standard: null,
+        category: null,
         checkSub: true
 
       };
@@ -541,13 +548,12 @@ export default {
       });
     },
     drillTypeSelected() {
-      console.log("drillTypeSelected", this.form.type)
-      if (this.form.type==0){
+      if (this.form.category==0){
         this.form.planCycle =4;
         this.form.execTimes =1;
         this.form.execOrgType =4;
       }
-      if (this.form.type==1){
+      if (this.form.category==1){
         this.form.planCycle =6;
         this.form.execTimes =2;
         this.form.execOrgType =4;

src/views/core/drill/task/dialog.evaluate.vue

@@ -5,13 +5,19 @@
         <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                  label-suffix=":">
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="type" label="任务名称">{{
                   formData.title
                 }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item prop="type" label="演练类型">{{
+                  formData.categoryText
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item prop="type" label="任务进度">{{
                   getLabel(dict.type.drill_task_status, formData.status,"未知")
                 }}

src/views/core/drill/task/dialog.info.vue

@@ -5,13 +5,19 @@
         <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                  label-suffix=":">
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="type" label="任务名称">{{
                   formData.title
                 }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item prop="type" label="演练类型">{{
+                  formData.categoryText
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item prop="type" label="任务进度">{{
                   getLabel(dict.type.drill_task_status, formData.status,"未知")
                 }}

src/views/core/drill/task/dialog.newtask.vue

@@ -6,7 +6,7 @@
                  label-width="120px" label-prefix=":">
           <el-row>
             <!-- 演练主题 -->
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
@@ -17,6 +17,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="演练类型" prop="category">
+                <el-select style="width: 100%" v-model="formData.category" placeholder="请选择演练类型">
+                  <el-option v-for="dict in dict.type.core_drill_category" :key="dict.value" :label="dict.label"
+                             :value="parseInt(dict.value)"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="演练项目" prop="type">
                 <el-select style="width: 100%" v-model="formData.type" placeholder="请选择演练项目">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
@@ -136,6 +144,7 @@ export default {
       formData: this.reset(),
       formDataRules: {
         title: [{required: true, message: "请输入任务名称"}],
+        category: [{required: true, message: "请输入演练类型"}],
         drillStartTime: [{required: true, message: "请选择演练开始时间"}],
         drillEndTime: [{required: true, message: "请选择演练结束时间"}],
         drillSite: [{required: true, message: "请输入演练地点"}],
@@ -160,7 +169,7 @@ export default {
       defaultSelect: [],
     };
   },
-  dicts: ["core_drill_type","core_drill_type"],
+  dicts: ["core_drill_type","core_drill_type","core_drill_category"],
   props: {},
   watch: {},
   computed: {

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

@@ -6,12 +6,18 @@
                  label-width="120px" label-prefix=":">
           <el-row>
             <!-- 培训主题 -->
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="title" label="任务名称">
                 {{ formData.title }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item prop="category" label="演练类型">{{
+                  formData.categoryText
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item prop="orgName" label="演练机构">
                 {{ formData.orgName }}
               </el-form-item>

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

@@ -225,6 +225,7 @@ export default {
       total: 0,
       // 教育任务表格数据
       eduTaskList: [],
+      timeClearable:true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层

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

@@ -429,10 +429,15 @@ export default {
       });
     },
     showBuildTaskNow(){
+      //如果是新增的情况下
       if (!this.form.id){
        return this.form.planCycle != 0
       }else {
-        return this.form.planCycle != 0&&this.form.issue == 0
+        //如果是编辑的情况下，判断是否是标准计划
+        if (this.form.standard==1){
+          return this.form.planCycle != 0&&this.form.issue == 0
+        }
+        return false;
       }
     },
     /** 查询教育培训计划列表 */
@@ -559,7 +564,8 @@ export default {
         buildTaskNow: null,
         remark: null,
         planRoleId: null,
-        fileList: null
+        fileList: null,
+        standard: null,
 
       };
       this.resetForm("form");

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

@@ -1,266 +1,286 @@
 <template>
-    <div class="edu-training-edit">
-        <DialogCom title="培训任务详情" :visible.sync="isShow" width="960px">
-            <div class="page-body">
-                <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
-                    label-suffix=":">
-                    <el-row>
+  <div class="edu-training-edit">
+    <DialogCom title="培训任务详情" :visible.sync="isShow" width="960px">
+      <div class="page-body">
+        <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
+                 label-suffix=":">
+          <el-row>
 
-                        <!-- 培训主题 -->
-                        <el-col :span="12">
-                            <el-form-item prop="type" label="任务名称">{{
-                                formData.title
-                            }}</el-form-item>
-                        </el-col>
-                      <el-col :span="12">
-                        <el-form-item prop="statusText" label="任务进度">{{
-                            formData.statusText
-                          }}</el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item prop="startDate" label="任务时间">{{
-                            formData.startDate}}-{{formData.endDate}}
-                          </el-form-item>
-                      </el-col>
+            <!-- 培训主题 -->
+            <el-col :span="24">
+              <el-form-item prop="type" label="任务名称">{{
+                  formData.title
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="typeText" label="培训类型">{{
+                  formData.typeText
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="statusText" label="任务进度">{{
+                  formData.statusText
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="startDate" label="任务时间">{{
+                  formData.startDate
+                }}-{{ formData.endDate }}
+              </el-form-item>
+            </el-col>
 
-                        <!-- 机构 -->
-                      <el-col :span="12">
-                            <el-form-item label="受训机构">{{
-                                formData.orgName
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 执行角色 -->
-                        <!-- <el-col :span="12">
-                            <el-form-item prop="eduJobId" label="执行角色">{{
-                                formData.eduJobNames
-                            }}</el-form-item>
-                        </el-col> -->
-                        <!-- 类型 -->
-<!--                        <el-col :span="12">
-                            <el-form-item label="类型">
-                                <template>
-                                    <dict-tag :options="dict.type.edu_type" :value="formData.type" />
-                                </template>
-                            </el-form-item>
-                        </el-col>-->
-                        <!-- 主持人 -->
-                        <el-col :span="12">
-                            <el-form-item prop="hostId" label="主持人">{{
-                                formData.hostName
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 记录人 -->
-                        <el-col :span="12">
-                            <el-form-item prop="recorderId" label="登记人">{{
-                                formData.recorderName
-                            }}</el-form-item>
-                        </el-col>
+            <!-- 机构 -->
+            <el-col :span="12">
+              <el-form-item label="受训机构">{{
+                  formData.orgName
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 执行角色 -->
+            <!-- <el-col :span="12">
+                <el-form-item prop="eduJobId" label="执行角色">{{
+                    formData.eduJobNames
+                }}</el-form-item>
+            </el-col> -->
+            <!-- 类型 -->
+            <!--                        <el-col :span="12">
+                                        <el-form-item label="类型">
+                                            <template>
+                                                <dict-tag :options="dict.type.edu_type" :value="formData.type" />
+                                            </template>
+                                        </el-form-item>
+                                    </el-col>-->
+            <!-- 主持人 -->
+            <el-col :span="12">
+              <el-form-item prop="hostId" label="主持人">{{
+                  formData.hostName
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 记录人 -->
+            <el-col :span="12">
+              <el-form-item prop="recorderId" label="登记人">{{
+                  formData.recorderName
+                }}
+              </el-form-item>
+            </el-col>
 
-                        <!-- 培训开始时间 -->
-                        <el-col :span="12">
-                            <el-form-item prop="trainingStartDateTime" label="培训开始时间">{{
-                                formData.trainingStartDateTime
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 培训截止时间 -->
-                        <el-col :span="12">
-                            <el-form-item prop="trainingEndDateTime" label="培训结束时间">{{
-                                formData.trainingEndDateTime
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 开始日期 -->
-                        <!-- <el-col :span="12">
-                            <el-form-item prop="dateTime" label="开始日期">{{
-                                formData.startDate
-                            }}</el-form-item>
-                        </el-col> -->
-                        <!-- 截止日期 -->
-                        <!-- <el-col :span="12">
-                            <el-form-item prop="dateTime" label="截止日期">{{
-                                formData.endDate
-                            }}</el-form-item>
-                        </el-col> -->
-                        <!-- 内容 -->
-                        <el-col :span="24">
-                            <el-form-item prop="content" label="培训内容">{{
-                                formData.content
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 总结 -->
-                        <el-col :span="24">
-                            <el-form-item prop="note" label="培训总结">{{
-                                formData.note
-                            }}</el-form-item>
-                        </el-col>
+            <!-- 培训开始时间 -->
+            <el-col :span="12">
+              <el-form-item prop="trainingStartDateTime" label="培训开始时间">{{
+                  formData.trainingStartDateTime
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 培训截止时间 -->
+            <el-col :span="12">
+              <el-form-item prop="trainingEndDateTime" label="培训结束时间">{{
+                  formData.trainingEndDateTime
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 开始日期 -->
+            <!-- <el-col :span="12">
+                <el-form-item prop="dateTime" label="开始日期">{{
+                    formData.startDate
+                }}</el-form-item>
+            </el-col> -->
+            <!-- 截止日期 -->
+            <!-- <el-col :span="12">
+                <el-form-item prop="dateTime" label="截止日期">{{
+                    formData.endDate
+                }}</el-form-item>
+            </el-col> -->
+            <!-- 内容 -->
+            <el-col :span="24">
+              <el-form-item prop="content" label="培训内容">{{
+                  formData.content
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 总结 -->
+            <el-col :span="24">
+              <el-form-item prop="note" label="培训总结">{{
+                  formData.note
+                }}
+              </el-form-item>
+            </el-col>
 
 
-                        <!-- 参与人数 -->
-                        <el-col :span="12">
-                            <el-form-item prop="dueCount" label="参会人员">{{
-                                formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
-                                    .map((v) => v.userName).join(",") : ""
-                            }}</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item prop="dueCount" label="缺席人员">{{
-                                formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
-                                    .map((v) => v.userName).join(",") : ""
-                            }}</el-form-item>
-                        </el-col>
-                        <!-- 图片 -->
-                        <el-col :span="24">
-                            <el-form-item prop="imageList" label="培训图片">
-                                <ImageListPreview v-model="formData.imageList"></ImageListPreview>
-                                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
-                                    moduleName="edu-training" v-if="isShow" /> -->
-                            </el-form-item>
-                        </el-col>
-                        <!-- 图片 -->
-                        <el-col :span="24">
-                            <el-form-item prop="imageList" label="参会人员签名">
-                                <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
-                                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
-                                    moduleName="edu-training" v-if="isShow" /> -->
-                            </el-form-item>
-                        </el-col>
+            <!-- 参与人数 -->
+            <el-col :span="12">
+              <el-form-item prop="dueCount" label="参会人员">{{
+                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
+                    .map((v) => v.userName).join(",") : ""
+                }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="dueCount" label="缺席人员">{{
+                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
+                    .map((v) => v.userName).join(",") : ""
+                }}
+              </el-form-item>
+            </el-col>
+            <!-- 图片 -->
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="培训图片">
+                <ImageListPreview v-model="formData.imageList"></ImageListPreview>
+                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
+                    moduleName="edu-training" v-if="isShow" /> -->
+              </el-form-item>
+            </el-col>
+            <!-- 图片 -->
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="参会人员签名">
+                <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
+                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
+                    moduleName="edu-training" v-if="isShow" /> -->
+              </el-form-item>
+            </el-col>
 
-                        <!-- 文件 -->
-                      <el-col :span="24">
-                        <el-form-item label="资料文件" prop="fileList">
-                          <K-file-upload ref="upload" :isShowUploadBtn="false"
-                                         :defaultValue="formFileListDefualtValue"
-                                         v-model="formData.fileList"/>
-                        </el-form-item>
-                      </el-col>
-<!--                        <el-col :span="24">
-                            <el-form-item prop="fileList" label="文件" :disabled="true">
-                                <div v-for="(v, i) in formData.fileList" :key="i">
-                                    <a class="downloadLink" @click="onDownload(JSON.parse(v).url, JSON.parse(v).name)">
-                                        {{ JSON.parse(v).name }}
-                                    </a>
-                                </div>
+            <!-- 文件 -->
+            <el-col :span="24">
+              <el-form-item label="资料文件" prop="fileList">
+                <K-file-upload ref="upload" :isShowUploadBtn="false"
+                               :defaultValue="formFileListDefualtValue"
+                               v-model="formData.fileList"/>
+              </el-form-item>
+            </el-col>
+            <!--                        <el-col :span="24">
+                                        <el-form-item prop="fileList" label="文件" :disabled="true">
+                                            <div v-for="(v, i) in formData.fileList" :key="i">
+                                                <a class="downloadLink" @click="onDownload(JSON.parse(v).url, JSON.parse(v).name)">
+                                                    {{ JSON.parse(v).name }}
+                                                </a>
+                                            </div>
 
-                            </el-form-item>
-                        </el-col>-->
-                    </el-row>
-                </el-form>
-            </div>
+                                        </el-form-item>
+                                    </el-col>-->
+          </el-row>
+        </el-form>
+      </div>
 
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="onHide">关闭</el-button>
-            </div>
-        </DialogCom>
-    </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onHide">关闭</el-button>
+      </div>
+    </DialogCom>
+  </div>
 </template>
 
 <script>
-import { mapState, mapMutations } from "vuex";
-import { getEduTask } from "@/api/core/edu/eduTask";
+import {mapState, mapMutations} from "vuex";
+import {getEduTask} from "@/api/core/edu/eduTask";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
+
 export default {
-    components: {KFileUpload},
-    dicts: ['edu_type', 'edu_task_status'],
-    data() {
-        const params = this.$route.params;
-        return {
-            id: params ? params.id : null,
-            isShow: false,
-            formData: this.reset(),
-          formFileListDefualtValue: [],
-        };
+  components: {KFileUpload},
+  dicts: ['edu_type', 'edu_task_status'],
+  data() {
+    const params = this.$route.params;
+    return {
+      id: params ? params.id : null,
+      isShow: false,
+      formData: this.reset(),
+      formFileListDefualtValue: [],
+    };
+  },
+  props: {},
+  watch: {},
+  computed: {
+    ...mapState(["loginUser"]),
+  },
+  methods: {
+    ...mapMutations([]),
+    reset(other = {}) {
+      return {
+        id: null,
+        type: null,
+        host: {},
+        recorder: {},
+        dateTime: null,
+        dueCount: null,
+        actualCount: null,
+        content: null,
+        imageList: null,
+        signImageList: null,
+        typeText: null,
+        org: {},
+        ...other,
+      };
+    },
+    async refresh(id, other) {
+      if (!id) {
+        this.reset(other);
+      } else {
+        getEduTask(id).then(response => {
+          this.formData = response.data;
+          this.formFileListDefualtValue = response.data.fileList;
+          this.formData.signImageList = this.getSingImageList();
+          this.loading = false;
+        })
+      }
+    },
+    async show(id, other = {}) {
+      this.id = id;
+      await this.refresh(id, other);
+      this.isShow = true;
+    },
+    // 事件
+    onHide() {
+      this.isShow = false;
+    },
+    onDownload(url, filename) {
+      let this_ = this;
+      this.getBlob(url, function (blob) {
+        this_.saveAs(blob, filename);
+      });
+    },
+    getSingImageList() {
+      let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
+        .map((v) => v.signImage).join(",") : null;
+      return res;
     },
-    props: {},
-    watch: {},
-    computed: {
-        ...mapState(["loginUser"]),
+    getBlob(url, cb) {
+      var xhr = new XMLHttpRequest();
+      xhr.open("GET", url, true);
+      xhr.responseType = "blob";
+      xhr.onload = function () {
+        if (xhr.status === 200) {
+          cb(xhr.response);
+        }
+      };
+      xhr.send();
     },
-    methods: {
-        ...mapMutations([]),
-        reset(other = {}) {
-            return {
-                id: null,
-                type: null,
-                host: {},
-                recorder: {},
-                dateTime: null,
-                dueCount: null,
-                actualCount: null,
-                content: null,
-                imageList: null,
-                signImageList:null,
-                org: {},
-                ...other,
-            };
-        },
-        async refresh(id, other) {
-            if (!id) {
-                this.reset(other);
-            }
-            else {
-                getEduTask(id).then(response => {
-                    this.formData = response.data;
-                  this.formFileListDefualtValue=response.data.fileList;
-                    this.formData.signImageList=this.getSingImageList();
-                    this.loading = false;
-                })
-            }
-        },
-        async show(id, other = {}) {
-            this.id = id;
-            await this.refresh(id, other);
-            this.isShow = true;
-        },
-        // 事件
-        onHide() {
-            this.isShow = false;
-        },
-        onDownload(url, filename) {
-            let this_ = this;
-            this.getBlob(url, function (blob) {
-                this_.saveAs(blob, filename);
-            });
-        },
-        getSingImageList() {
-            let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
-                .map((v) => v.signImage).join(",") : null;
-            return res;
-        },
-        getBlob(url, cb) {
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", url, true);
-            xhr.responseType = "blob";
-            xhr.onload = function () {
-                if (xhr.status === 200) {
-                    cb(xhr.response);
-                }
-            };
-            xhr.send();
-        },
-       saveAs(blob, filename) {
-             console.log("saveAs",blob,filename)
-            if (window.navigator.msSaveOrOpenBlob) {
-                navigator.msSaveBlob(blob, filename);
-            } else {
-                let link = document.createElement("a");
-                let body = document.querySelector("body");
+    saveAs(blob, filename) {
+      console.log("saveAs", blob, filename)
+      if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, filename);
+      } else {
+        let link = document.createElement("a");
+        let body = document.querySelector("body");
 
-                 link.href = URL.createObjectURL(blob);
-                 link.download = filename;
+        link.href = URL.createObjectURL(blob);
+        link.download = filename;
 
-                 // fix Firefox
-                 link.style.display = "none";
-                 body.appendChild(link);
+        // fix Firefox
+        link.style.display = "none";
+        body.appendChild(link);
 
-                 link.click();
-                 body.removeChild(link);
+        link.click();
+        body.removeChild(link);
 
-                window.URL.revokeObjectURL(link.href);
-           }
-        },
-        // 事件
-        //apimark//
+        window.URL.revokeObjectURL(link.href);
+      }
     },
-    mounted() { },
+    // 事件
+    //apimark//
+  },
+  mounted() {
+  },
 };
 </script>
 

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

@@ -7,7 +7,7 @@
           <el-row>
 
             <!-- 培训主题 -->
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
@@ -18,6 +18,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="培训类型" prop="type">
+                <el-select style="width: 100%" v-model="formData.type" placeholder="请选择培训类型">
+                  <el-option v-for="dict in dict.type.edu_training_type" :key="dict.value" :label="dict.label"
+                             :value="parseInt(dict.value)"></el-option>
+                </el-select>
+              </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"
                                 format="yyyy-MM-dd HH:mm"
@@ -135,6 +143,7 @@ import DialogSelectFile from "../plan/dialog.select.file.vue"
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 
 export default {
+  dicts: ['edu_type', 'edu_task_status', 'sys_org_type','edu_training_type'],
   components: {KTextarea, KFileUpload, KSelect, imgUpload, OrgTreeSelect, DialogSelectFile},
   data() {
     const params = this.$route.params;
@@ -144,6 +153,7 @@ export default {
       formData: this.reset(),
       formDataRules: {
         title: [{required: true, message: "请输入任务名称"}],
+        type: [{required: true, message: "请输入培训类型"}],
         content: [{required: true, message: "请输入培训内容"}],
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
         startDate: [{required: true, message: "请输入培训开始时间"}],
@@ -165,7 +175,6 @@ export default {
       formFileListDefualtValue: [],
     };
   },
-  dicts: ['edu_type', 'edu_task_status', 'sys_org_type'],
   props: {},
   watch: {},
   computed: {
@@ -192,6 +201,7 @@ export default {
         trainingEndDateTime: null,
         // dueCount: null,
         // actualCount: null,
+        type: null,
         content: null,
         title: null,
         eduJobId: null,

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

@@ -6,7 +6,7 @@
                  label-width="120px" label-prefix=":">
           <el-row>
             <!-- 培训主题 -->
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="title" label="任务名称">
                 <!-- <el-input
                         v-model="formData.title"
@@ -19,6 +19,12 @@
                 {{ formData.title }}
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item prop="typeText" label="培训类型">{{
+                  formData.typeText
+                }}
+              </el-form-item>
+            </el-col>
 <!--           <el-col :span="12">
               <el-form-item prop="orgName" label="培训机构">
                 {{ formData.orgName }}
@@ -101,7 +107,7 @@
                 <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
-            
+
           </el-row>
         </el-form>
       </div>
@@ -132,6 +138,7 @@ import KFileUpload from "@/components/K-FileUpload/index.vue";
 import DialogSelectFile from "../plan/dialog.select.file.vue";
 export default {
   components: {KTextarea, KSelect, imgUpload, KFileUpload,DialogSelectFile},
+  dicts: ['sys_org_type', 'edu_plan_cycle', 'edu_plan_status','edu_training_type'],
   data() {
     const params = this.$route.params;
     return {
@@ -159,7 +166,6 @@ export default {
       defaultSelect: [],
     };
   },
-  dicts: ['edu_type', 'edu_task_status'],
   props: {},
   watch: {},
   computed: {

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

@@ -245,6 +245,7 @@ export default {
       total: 0,
       // 教育任务表格数据
       eduTaskList: [],
+      timeClearable: true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层