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

@@ -29,12 +29,12 @@
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="演练角色" prop="planRoleId">
-            <el-select v-model="queryParams.planRoleId" placeholder="请选择演练角色" clearable>
-              <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
-                         :value="item.roleId"></el-option>
-            </el-select>
-          </el-form-item>
+          <!--          <el-form-item label="演练角色" prop="planRoleId">
+                      <el-select v-model="queryParams.planRoleId" placeholder="请选择演练角色" clearable>
+                        <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
+                                   :value="item.roleId"></el-option>
+                      </el-select>
+                    </el-form-item>-->
           <el-form-item label="计划名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -67,20 +67,20 @@
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
           </el-table-column>
-          <el-table-column prop="planRoleNameList" label="演练角色" width="200">
-            <template slot-scope="scope">
-              <template v-if="scope.row.planRoleNameList">
-                <el-tag size="mini" type="success" style="margin-right: 5px;"
-                        v-for="(item, index) in (scope.row.planRoleNameList || '').split(',')"
-                        :key="index">
-                  {{ item }}
-                </el-tag>
-              </template>
-              <template v-else>
-                <el-tag size="mini">{{ scope.row.checkOrgTypeText }}</el-tag>
-              </template>
-            </template>
-          </el-table-column>
+          <!--          <el-table-column prop="planRoleNameList" label="演练角色" width="200">
+                      <template slot-scope="scope">
+                        <template v-if="scope.row.planRoleNameList">
+                          <el-tag size="mini" type="success" style="margin-right: 5px;"
+                                  v-for="(item, index) in (scope.row.planRoleNameList || '').split(',')"
+                                  :key="index">
+                            {{ item }}
+                          </el-tag>
+                        </template>
+                        <template v-else>
+                          <el-tag size="mini">{{ scope.row.checkOrgTypeText }}</el-tag>
+                        </template>
+                      </template>
+                    </el-table-column>-->
           <el-table-column label="计划周期" align="center" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_plan_cycle" :value="scope.row.planCycle"/>
@@ -103,7 +103,7 @@
                          @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
-                         @click="handleUpdate(scope.row)" v-hasPermi="['core:drillPlan:edit']">修改
+                         @click="handleUpdate(scope.row)" v-hasPermi="['core:drillPlan:edit']">编辑
               </el-button>
               <el-button v-if="checkCanDel(scope.row)" size="mini" type="text" icon="el-icon-delete"
                          @click="handleDelete(scope.row)" v-hasPermi="['core:drillPlan:remove']">删除
@@ -118,7 +118,8 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog"  :close="cancel" width="850px" height="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog" :close="cancel" width="850px"
+               height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
@@ -139,13 +140,13 @@
 
           <el-col :span="12" v-show="form.planCycle != 0">
             <el-form-item label="立即生效" prop="buildTaskNow">
-<!--              <el-checkbox v-model="form.buildTaskNow">
-                默认从下个周期...
-                <el-popover placement="top-start" title="" width="200" trigger="hover"
-                            content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
-                  <i class="el-icon-warning-outline change-icon" slot="reference"></i>
-                </el-popover>
-              </el-checkbox>-->
+              <!--              <el-checkbox v-model="form.buildTaskNow">
+                              默认从下个周期...
+                              <el-popover placement="top-start" title="" width="200" trigger="hover"
+                                          content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
+                                <i class="el-icon-warning-outline change-icon" slot="reference"></i>
+                              </el-popover>
+                            </el-checkbox>-->
               <el-checkbox v-model="form.buildTaskNow">
                 默认从下个周期生成任务，
                 <br/>
@@ -193,24 +194,24 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="演练角色" prop="planRoleId">
-              <el-select v-model="form.planRoleId" placeholder="请选择" multiple style="width:100%">
-                <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <!-- <el-row>
+           <el-col :span="12">
+             <el-form-item label="演练角色" prop="planRoleId">
+               <el-select v-model="form.planRoleId" placeholder="请选择" multiple style="width:100%">
+                 <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
 
-<!--          <el-col :span="12">
-            <el-form-item v-if="this.form.id" label="计划状态" prop="planStatus">
-              <el-select v-model="form.planStatus" placeholder="请选择计划状态" style="width: 100%;">
-                <el-option v-for="dict in dict.type.drill_plan_status" :key="dict.value" :label="dict.label"
-                           :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>-->
-        </el-row>
+           <el-col :span="12">
+             <el-form-item v-if="this.form.id" label="计划状态" prop="planStatus">
+               <el-select v-model="form.planStatus" placeholder="请选择计划状态" style="width: 100%;">
+                 <el-option v-for="dict in dict.type.drill_plan_status" :key="dict.value" :label="dict.label"
+                            :value="parseInt(dict.value)"></el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
+        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item v-show="form.execOrgType" label="演练机构" prop="planExecOrgIdList">
@@ -241,7 +242,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-   </DialogCom>
+    </DialogCom>
     <DialogSelectFile
       ref="DialogSelectFile"
       :defaultSelect=defaultSelect
@@ -270,6 +271,7 @@ import {deptTreeSelect} from "@/api/system/public";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import DialogSelectFile from "./dialog.select.file.vue";
 import OrgTreeSelect from '@/components/orgTreeSelect'
+import dayjs from "dayjs";
 
 export default {
   name: "Plan",
@@ -354,7 +356,7 @@ export default {
   },
   created() {
     this.getList();
-    this.initPlanRoleList();
+    //this.initPlanRoleList();
     this.orgId = this.$store.getters.orgId;
   },
   methods: {
@@ -410,15 +412,16 @@ export default {
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
       // console.log("checkCanEdit",this.$store.getters.orgId,row.belongOrgId)
-      return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
+     // return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
+      return (row.belongOrgId == this.$store.getters.orgId)
 
     },
     checkCanDel(row) {
       // console.log("checkCanEdit",this.$store.getters.orgId,row)
       // 计划仅能够通过删除标准计划来删除
-     /* return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
-        && (row.issue != 1 || (row.issue == 1 && row.done != 1))*/
-      return row.standard == 1 && row.done != 1
+      /* return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
+         && (row.issue != 1 || (row.issue == 1 && row.done != 1))*/
+      return row.standard == 1 && row.done != 1  && this.checkCanEdit(row);
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
@@ -426,7 +429,7 @@ export default {
     },
     execOrgTypeChanged(row) {
       this.$refs['orgTreeSelect'].clear();
-      this.initRoleList(this.form.execOrgType);
+      // this.initRoleList(this.form.execOrgType);
       // this.form.planExecOrgIdList = [];
     },
     /** 查询机构树数据 */
@@ -442,8 +445,8 @@ export default {
       this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
     },
-    closeDialog(){
-     this.cancel();
+    closeDialog() {
+      this.cancel();
     },
     // 表单重置
     reset() {
@@ -478,7 +481,7 @@ export default {
     },
     // 节点单击事件
     clickTreeNode(data) {
-      this.initPlanRoleList();
+      //this.initPlanRoleList();
       this.queryParams.belongOrgId = data.id;
       this.handleQuery();
     },
@@ -512,15 +515,15 @@ export default {
 
     /** 新增按钮操作 */
     handleAdd() {
-      this.initRoleList();
+      //this.initRoleList();
       this.getDeptTree()
       this.reset();
       this.open = true;
-      this.title = "添加预案演练计划";
+      this.title = "新增演练计划";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.initRoleList();
+      // this.initRoleList();
       this.getDeptTree()
       this.reset();
       const id = row.id || this.ids
@@ -528,11 +531,15 @@ export default {
         this.form = response.data;
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "修改预案演练计划";
+        this.title = "编辑演练计划";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      if (dayjs(this.form.startDate).isAfter(dayjs(this.form.endDate))) {
+        this.$message.error("开始时间不能大于结束时间!");
+        return;
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           let request = {...this.form};
@@ -544,10 +551,10 @@ export default {
             request.planExecOrgIdList = [];
           }
           if (request.id != null) {
-            this.$modal.confirm(this.getMsgStr(request,'修改')).then(function () {
+            this.$modal.confirm(this.getMsgStr(request, '编辑')).then(function () {
               return updatePlan(request);
             }).then(() => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("编辑成功");
               this.open = false;
               this.getList();
             }).catch(() => {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom title="教育培训详情" :visible.sync="isShow" width="960px">
+    <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=":">

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

@@ -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="form" label-position="right"
-          label-width="120px" label-prefix=":">
+                 label-width="120px" label-prefix=":">
           <el-row>
             <!-- 培训主题 -->
             <el-col :span="12">
@@ -19,20 +19,20 @@
             <el-col :span="12">
               <el-form-item prop="dateTime" label="演练时间">
                 <el-date-picker v-model="formData.drillTime" :picker-options="startDatepickerOptions" type="datetime"
-                  placeholder="选择日期">
+                                placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="content" label="演练地点">
-                <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50" />
+                <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="演练类型" prop="type">
                 <el-select v-model="formData.type" placeholder="请选择演练类型">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
-                    :value="parseInt(dict.value)">
+                             :value="parseInt(dict.value)">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -40,26 +40,28 @@
 
             <el-col :span="24">
               <el-form-item prop="presetCase" label="预设案由">
-                <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000" />
+                <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item prop="drillSituation" label="演练情况">
-                <k-textarea v-model="formData.drillSituation" placeholder="请输入演练情况" :length="2000" />
+                <k-textarea v-model="formData.drillSituation" placeholder="请输入演练情况" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item prop="absenceList" label="参与人员">
                 <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
-                  :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员" @select="absenceUserSelectChanged"></k-select>
+                          :params="{ orgId: formData.orgId }" placeholder="请选择缺席人员"
+                          @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <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>
@@ -78,20 +80,20 @@
         <el-button type="primary" @click="onSave">暂存</el-button>
         <el-button type="primary" @click="onSubmit">提交</el-button>
       </div>
-   </DialogCom>
+    </DialogCom>
   </div>
 </template>
 
 <script>
-import { mapState, mapMutations } from "vuex";
-import { getDrillTask, recordDrillTask } from "@/api/core/drill/drillTask";
+import {mapState, mapMutations} from "vuex";
+import {getDrillTask, recordDrillTask} from "@/api/core/drill/drillTask";
 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";
 
 export default {
-  components: { KTextarea, KSelect, imgUpload },
+  components: {KTextarea, KSelect, imgUpload},
   data() {
     const params = this.$route.params;
     return {
@@ -99,12 +101,12 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        drillTime: [{ required: true, message: "请选择演练时间" }],
-        drillSite: [{ required: true, message: "请输入演练地点" }],
-        type: [{ required: true, message: "请选择演练类型" }],
-        presetCase: [{ required: true, message: "请输入预设案由" }],
-        drillSituation: [{ required: true, message: "请输入预设案由" }],
-        absenceList: [{ required: true, type: "array", message: "请选择参与人员", trigger: ['blur', 'change'] }],
+        drillTime: [{required: true, message: "请选择演练时间"}],
+        drillSite: [{required: true, message: "请输入演练地点"}],
+        type: [{required: true, message: "请选择演练类型"}],
+        presetCase: [{required: true, message: "请输入预设案由"}],
+        drillSituation: [{required: true, message: "请输入预设案由"}],
+        absenceList: [{required: true, type: "array", message: "请选择参与人员", trigger: ['blur', 'change']}],
       },
       startDatepickerOptions: {
         disabledDate(time) {
@@ -152,17 +154,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 = [];
         }
@@ -237,7 +242,7 @@ export default {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
         return;
       }
-      let request = { submitType: 1, ...this.formData };
+      let request = {submitType: 1, ...this.formData};
       if (request.drillTime)
         request.drillTime = dayjs(request.drillTime).format("YYYY-MM-DD HH:mm:ss");
 
@@ -253,7 +258,7 @@ export default {
       if (!this.validatePerson()) {
         this.$message.error("参与人员与缺席人员重复，请重新选择!");
       } else {
-        let request = { submitType: 2, ...this.formData };
+        let request = {submitType: 2, ...this.formData};
         if (request.drillTime)
           request.drillTime = dayjs(request.drillTime).format("YYYY-MM-DD HH:mm:ss");
 
@@ -273,7 +278,8 @@ export default {
       }
       return true;
     },
-    uploadTriggerEvent(value) { },
+    uploadTriggerEvent(value) {
+    },
 
     endDisabledDate(time) {
       //小于开始日期禁止选择
@@ -304,7 +310,8 @@ export default {
       }
     },
   },
-  mounted() { },
+  mounted() {
+  },
 };
 </script>
 

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

@@ -49,7 +49,7 @@
 
         <el-table height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="演练机构" align="center" prop="orgName"/>
-          <el-table-column label="演练角色" align="center">
+<!--          <el-table-column label="演练角色" align="center">
             <template slot-scope="scope">
               <template v-if="scope.row.taskRoleNameList  ">
                 <el-tag size="mini" type="success"
@@ -59,7 +59,7 @@
                 </el-tag>
               </template>
             </template>
-          </el-table-column>
+          </el-table-column>-->
           <el-table-column label="演练类型" align="center" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.type"/>

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

@@ -142,11 +142,12 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog"  @close="cancel" width="850px" height="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog" @close="cancel" width="850px"
+               height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="培训主题" prop="planName" class="endItem" >
+            <el-form-item label="培训主题" prop="planName" class="endItem">
               <el-input v-model="form.planName" maxlength="50" placeholder="请输入培训主题"/>
             </el-form-item>
           </el-col>
@@ -168,10 +169,10 @@
                 默认从下个周期生成任务，
                 <br/>
                 勾选后从当前周期立即生成任务
-<!--                <el-popover placement="top-start" title="" width="200" trigger="hover"
-                            content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
-                  <i class="el-icon-warning-outline change-icon" slot="reference"></i>
-                </el-popover>-->
+                <!--                <el-popover placement="top-start" title="" width="200" trigger="hover"
+                                            content="默认从下个周期生成任务，勾选后从当前周期立即生成任务">
+                                  <i class="el-icon-warning-outline change-icon" slot="reference"></i>
+                                </el-popover>-->
               </el-checkbox>
             </el-form-item>
 
@@ -222,14 +223,14 @@
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="12">
-            <el-form-item v-if="this.form.id" label="计划状态" prop="planStatus">
-              <el-select style="width: 100%" v-model="form.planStatus" placeholder="请选择计划状态">
-                <el-option v-for="dict in dict.type.edu_plan_status" :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 v-if="this.form.id" label="计划状态" prop="planStatus">
+                        <el-select style="width: 100%" v-model="form.planStatus" placeholder="请选择计划状态">
+                          <el-option v-for="dict in dict.type.edu_plan_status" :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 v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
               <org-tree-select v-model="form.planExecOrgIdList" :queryData="form.execOrgType"
@@ -241,7 +242,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" maxlength="200" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" show-word-limit placeholder="请输入备注"/>
+              <el-input v-model="form.remark" maxlength="200" :autosize="{ minRows: 2, maxRows: 4}" type="textarea"
+                        show-word-limit placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -292,6 +294,7 @@ import OrgTree from "@/components/orgTree";
 import {deptTreeSelect} from "@/api/system/public";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import DialogSelectFile from "./dialog.select.file.vue";
+import dayjs from "dayjs";
 
 export default {
   name: "Plan",
@@ -453,18 +456,18 @@ export default {
     },
     //所属机构为当前用户登录机构或等于创建机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      return (row.belongOrgId == this.$store.getters.orgId || row.createOrgId == this.$store.getters.orgId)
+      return (row.belongOrgId == this.$store.getters.orgId)
     },
     checkCanDel(row) {
       // 计划仅能够通过删除标准计划来删除
-     /* return (row.belongOrgId == this.$store.getters.orgId)
-       /!* && (row.issue != 1 || (row.issue == 1 && row.done != 1))*!/
-        && !row.parentId && row.createByTopOrg!=1*/
-      return row.standard == 1 && row.done != 1
+      /* return (row.belongOrgId == this.$store.getters.orgId)
+        /!* && (row.issue != 1 || (row.issue == 1 && row.done != 1))*!/
+         && !row.parentId && row.createByTopOrg!=1*/
+      return row.standard == 1 && row.done != 1 && this.checkCanEdit(row);
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
-      return row.createByTopOrg !== 1
+      return row.createByTopOrg !== 1 && this.checkCanEdit(row);
     },
     execOrgTypeChanged(row) {
       this.$refs['orgTreeSelect'].clear();
@@ -485,8 +488,8 @@ export default {
       this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
     },
-    closeDialog(){
-     this.cancel();
+    closeDialog() {
+      this.cancel();
     },
     // 表单重置
     reset() {
@@ -579,6 +582,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (dayjs(this.form.startDate).isAfter(dayjs(this.form.endDate))) {
+        this.$message.error("开始时间不能大于结束时间!");
+        return;
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           let request = {...this.form};