演练评价逻辑修改

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

@@ -86,7 +86,8 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >搜索</el-button
+                >搜索
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -95,7 +96,8 @@
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >重置</el-button
+                >重置
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -104,7 +106,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="handleAddTask"
-                  >临时登记
+                >临时登记
                 </el-button>
               </el-col>
               <el-col :span="1.5">
@@ -113,7 +115,7 @@
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  >导出数据
+                >导出数据
                 </el-button>
               </el-col>
               <right-toolbar
@@ -193,8 +195,8 @@
                 {{
                   scope.row.startDate
                     ? dayjs(scope.row.startDate).format("YYYY年MM月DD日") +
-                      " ~ " +
-                      dayjs(scope.row.endDate).format("YYYY年MM月DD日")
+                    " ~ " +
+                    dayjs(scope.row.endDate).format("YYYY年MM月DD日")
                     : ""
                 }}
               </template>
@@ -233,7 +235,7 @@
                   icon="el-icon-view"
                   @click="handleDetail(scope.row.id)"
                   v-hasPermi="['core:drillTask:query']"
-                  >详情
+                >详情
                 </el-button>
                 <el-button
                   size="mini"
@@ -242,7 +244,7 @@
                   v-if="canEvaluate(scope.row)"
                   @click="handleEvaluate(scope.row.id)"
                   v-hasPermi="['core:drillTask:evaluate']"
-                  >评价
+                >评价
                 </el-button>
                 <el-button
                   size="mini"
@@ -251,7 +253,7 @@
                   v-if="canPerform(scope.row)"
                   @click="handleRecorded(scope.row.id)"
                   v-hasPermi="['core:drillTask:edit']"
-                  >任务登记
+                >任务登记
                 </el-button>
                 <el-button
                   size="mini"
@@ -260,13 +262,13 @@
                   v-if="canDelete(scope.row)"
                   @click="handleDelete(scope.row.id)"
                   v-hasPermi="['core:drillTask:remove']"
-                  >删除
+                >删除
                 </el-button>
                 <el-button
                   type="text"
                   v-if="scope.row.pdfUrl"
                   @click="onDown(scope.row.pdfUrl)"
-                  >演练登记簿
+                >演练登记簿
                 </el-button>
               </template>
             </el-table-column>
@@ -299,7 +301,7 @@
 </template>
 
 <script>
-import { listDrillTask, delDrillTask } from "@/api/core/drill/drillTask";
+import {listDrillTask, delDrillTask} from "@/api/core/drill/drillTask";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import DialogInfo from "./dialog.info";
@@ -307,9 +309,9 @@ import DialogPerform from "./dialog.perform";
 import DialogNewTask from "./dialog.newtask";
 import DialogEvaluate from "./dialog.evaluate";
 import dayjs from "dayjs";
-import { publishPlan } from "@/api/core/edu/plan";
-import { delDrillDictionary } from "@/api/core/drill/drillDictionary";
-import { delEduTask } from "@/api/core/edu/eduTask";
+import {publishPlan} from "@/api/core/edu/plan";
+import {delDrillDictionary} from "@/api/core/drill/drillDictionary";
+import {delEduTask} from "@/api/core/edu/eduTask";
 
 export default {
   name: "EduTask",
@@ -359,7 +361,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        orgId: [{ required: true, message: "机构不能为空", trigger: "blur" }],
+        orgId: [{required: true, message: "机构不能为空", trigger: "blur"}],
       },
       selectedOrgName: null,
     };
@@ -407,7 +409,7 @@ export default {
       this.handleQuery();
     },
     clearQueryForm() {
-      this.queryParams.title=null;
+      this.queryParams.title = null;
       this.queryParams.type = null;
       this.queryParams.status = null;
       this.queryParams.range = [];
@@ -460,7 +462,8 @@ export default {
           this.$modal.msgSuccess("删除成功");
           this.getList();
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     /** 评价按钮操作 */
     handleEvaluate(id) {
@@ -473,11 +476,19 @@ export default {
       }, `eduTask_${new Date().getTime()}.xlsx`)
     },*/
     canEvaluate(row) {
+      let roleId;
+      if (row.orgType == 4) {
+        roleId = 120;
+      }
+      if (row.orgType == 3) {
+        roleId = 118;
+      }
+      if (row.orgType == 2 || row.orgType == 1) {
+        roleId = 116;
+      }
       //仅行社安全保卫管理人员进入且演练任务处于待评价状态才显示
       return (
-        row.status == 2 &&
-        this.$store.getters.roleList.some((item) => item.roleId == 120) &&
-        this.isNotOverOrUnStart(row)
+        row.status == 2 && this.$store.getters.roleList.some((item) => item.roleId == roleId) && this.isNotOverOrUnStart(row)
       );
     },
     canPerform(row) {