zhangjie 2 yıl önce
ebeveyn
işleme
db22b7cb07

+ 10 - 5
src/modules/grading/components/GradeAction.vue

@@ -292,7 +292,8 @@ export default {
       setT: null,
       setT: null,
       btnClicked: false,
       btnClicked: false,
       // 科组长权限
       // 科组长权限
-      markLeaderOnlyRight: null
+      markLeaderOnlyRight: null,
+      leaderConfirm: true
     };
     };
   },
   },
   computed: {
   computed: {
@@ -315,9 +316,12 @@ export default {
     }
     }
   },
   },
   mounted() {
   mounted() {
-    this.markLeaderOnlyRight = this.$ls.get("user", {
-      markLeaderOnlyRight: null
-    }).markLeaderOnlyRight;
+    const userRight = this.$ls.get("user", {
+      markLeaderOnlyRight: null,
+      leaderConfirm: true
+    });
+    this.markLeaderOnlyRight = userRight.markLeaderOnlyRight;
+    this.leaderConfirm = userRight.leaderConfirm;
 
 
     this.codeTypes = Object.entries(CODE_TYPE)
     this.codeTypes = Object.entries(CODE_TYPE)
       .map(([key, val]) => {
       .map(([key, val]) => {
@@ -401,7 +405,8 @@ export default {
             paperIds: this.curPaperOrTask.id + "",
             paperIds: this.curPaperOrTask.id + "",
             curLevel: this.curPaperOrTask.level,
             curLevel: this.curPaperOrTask.level,
             selectedLevel: level.name,
             selectedLevel: level.name,
-            markLeaderOnlyRight: this.markLeaderOnlyRight
+            markLeaderOnlyRight: this.markLeaderOnlyRight,
+            leaderConfirm: this.leaderConfirm
           },
           },
           this.gradingHistory.map(item => {
           this.gradingHistory.map(item => {
             return {
             return {

+ 2 - 2
src/modules/grading/leader/LeaderGrading.vue

@@ -567,13 +567,13 @@ export default {
     },
     },
     async leaderSelectLevel(levelInfo, markers) {
     async leaderSelectLevel(levelInfo, markers) {
       // 唯一权限时,直接操作
       // 唯一权限时,直接操作
-      if (levelInfo.markLeaderOnlyRight && !this.paramsSet.leaderConfirm) {
+      if (levelInfo.markLeaderOnlyRight && !levelInfo.leaderConfirm) {
         const datas = {
         const datas = {
           action: levelInfo.markLeaderOnlyRight.action,
           action: levelInfo.markLeaderOnlyRight.action,
           level: levelInfo.selectedLevel,
           level: levelInfo.selectedLevel,
           originLevel: levelInfo.curLevel,
           originLevel: levelInfo.curLevel,
           paperIds: levelInfo.paperIds,
           paperIds: levelInfo.paperIds,
-          leaderConfirm: this.paramsSet.leaderConfirm
+          leaderConfirm: levelInfo.leaderConfirm
         };
         };
         if (datas.action === "reject") {
         if (datas.action === "reject") {
           datas.range = markers.map(item => item.id).join();
           datas.range = markers.map(item => item.id).join();