修复缺陷

src/views/check/task/index.vue

@@ -487,7 +487,7 @@ export default {
       let taskRoleId = row.roles.map((r) => r.roleId);
 
       return (
-        row.status != 3 &&
+        row.status != 3  &&
         ((row.checkOrgId == this.orgId &&
           userRoleId.find((ur) => taskRoleId.includes(ur)) &&
           checkPermi([
@@ -497,7 +497,25 @@ export default {
           row.grantUserId === this.userId)
       );
     },
-    showRegister(row) {
+    showRegister(row) {    
+      if (
+        dayjs()
+          .startOf("day")
+          .isBefore(dayjs(row.planStartTime).startOf("day"))
+      ) {
+        this.$modal.alert("任务未到开始时间，不能操作");
+        return;
+      }
+
+      if (
+        dayjs()
+          .endOf("day")
+          .isAfter(dayjs(row.planEndTime).endOf("day"))
+      ) {
+        this.$modal.alert("任务已逾期，不能操作");
+        return;
+      }
+
       let path = "/core/safetycheck/register/" + row.id + "?mode=register";
       this.$router.push(path);
     },

src/views/resumption/protection/index.vue

@@ -5,7 +5,7 @@
       <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
-          @defaultKey="getDefaultKey"
+          @defaultOrg="getDefaultOrg"
           @checkChange="checkChange"
           @click="clickTreeNode"
         ></org-tree>
@@ -333,10 +333,8 @@ export default {
           this.loading = false;
         });
     },
-    getDefaultKey(key) {
-      this.queryParams.orgId = key;
-      (this.selectedOrgName = this.orgName), this.getList();
-    },
+    
+   
     handleAdd(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
@@ -355,7 +353,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `【${this.selectedOrgName}】-布撤防情况跟踪-${dayjs(new Date()).format(
+        `${this.selectedOrgName}-布撤防情况跟踪-${dayjs(new Date()).format(
           "YYYYMMDD"
         )}.xlsx`
       );
@@ -398,10 +396,16 @@ export default {
       this.queryParams.checkSub = state;
       this.getList();
     },
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      (this.selectedOrgName = data.name), this.getList();
+      this.selectedOrgName = data.shortName;
+       this.getList();
     },
   },
   mounted() {},

src/views/resumption/taskManager/index.vue

@@ -390,7 +390,7 @@ export default {
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      this.selectedOrgName = data.name;
+      this.selectedOrgName = data.shortName;
       this.loadPlanList();
       this.loadRoles(data.id);
       this.getList();

src/views/safetycheck/taskManager/components/register.vue

@@ -196,7 +196,7 @@ import imgUpload from "@/components/ImageUpload/index.vue";
 import UserSelector from "@/components/userSelector/index.vue";
 import { getLabel } from "@/views/commonOption.js";
 import { checkPermi } from "@/utils/permission.js";
-import {deptTreeWithSameTypeUp} from "@/api/system/org.js"
+import { deptTreeWithSameTypeUp } from "@/api/system/org.js";
 export default {
   name: "safetyCheckRegister",
   data() {
@@ -369,7 +369,7 @@ export default {
         this.$message.warning("请选择要授权的人员");
         return;
       }
-      let {planId,beCheckedOrgId,id,ymdDate}=this.taskInfo
+      let { planId, beCheckedOrgId, id, ymdDate } = this.taskInfo;
       api
         .grant({
           planId,
@@ -387,12 +387,46 @@ export default {
       this.$refs.UserSelector.show();
     },
     onSave() {
+      if (
+        dayjs()
+          .startOf("day")
+          .isBefore(dayjs(this.taskInfo.planStartTime).startOf("day"))
+      ) {
+        this.$modal.alert("任务未到开始时间，不能操作");
+        return;
+      }
+
+      if (
+        dayjs()
+          .endOf("day")
+          .isAfter(dayjs(this.taskInfo.planEndTime).endOf("day"))
+      ) {
+        this.$modal.alert("任务已逾期，不能操作");
+        return;
+      }
       this.taskInfo.isSubmit = 0;
       api.submit(this.taskInfo).then((r) => {
         this.$message.info("保存成功");
       });
     },
     async onSubmit() {
+      if (
+        dayjs()
+          .startOf("day")
+          .isBefore(dayjs(this.taskInfo.planStartTime).startOf("day"))
+      ) {
+        this.$modal.alert("任务未到开始时间，不能操作");
+        return;
+      }
+
+      if (
+        dayjs()
+          .endOf("day")
+          .isAfter(dayjs(this.taskInfo.planEndTime).endOf("day"))
+      ) {
+        this.$modal.alert("任务已逾期，不能操作");
+        return;
+      }
       let isOk = true;
       let r = this.$refs;
       for (let p in this.$refs) {