bug fix

src/modules/base/components/ModifyFlowDetail.vue

@@ -404,7 +404,7 @@ const initFlowInfo = {
   id: null,
   name: "",
   type: "ELECTRON_FLOW",
-  modelType: "USER_FIXED",
+  modelType: "APPROVE_SET",
 };
 
 const DEFAULT_NODE = {

src/modules/course/components/SelectBlueDimensionDialog.vue

@@ -17,6 +17,7 @@
       check-on-click-node
       node-key="id"
       :props="defaultProps"
+      @check-change="updateTreeStatus"
     >
     </el-tree>
 
@@ -78,12 +79,21 @@ export default {
         return {
           id: item.id,
           name: item.targetName,
-          children: item.dimensionList,
+          disabled: false,
+          children: item.dimensionList.map((elem) => {
+            return { ...elem, disabled: false };
+          }),
         };
       });
     },
     visibleChange() {
       this.$refs.treeRef.setCheckedKeys(this.selectedData);
+
+      this.$nextTick(() => {
+        this.updateTreeStatus();
+
+        console.log(this.treeData);
+      });
     },
     cancel() {
       this.modalIsShow = false;
@@ -91,6 +101,20 @@ export default {
     open() {
       this.modalIsShow = true;
     },
+    updateTreeStatus() {
+      const selectedNodes = this.$refs.treeRef.getCheckedNodes(false, true);
+      const targetNodes = selectedNodes.filter(
+        (item) => item.children && item.children.length
+      );
+      const selectTargetId = targetNodes.length ? targetNodes[0].id : "";
+
+      this.treeData.forEach((item) => {
+        item.disabled = selectTargetId ? item.id !== selectTargetId : false;
+        item.children.forEach((elem) => {
+          elem.disabled = item.disabled;
+        });
+      });
+    },
     submit() {
       const selectedNodes = this.$refs.treeRef.getCheckedNodes(false, true);
 

src/modules/mark/components/ScoreCheckDetail.vue

@@ -45,8 +45,8 @@
           <el-input v-model="filter.teacher" placeholder="任课老师" clearable>
           </el-input>
         </el-form-item>
-        <el-form-item label="检查条件">
-          <el-select v-model="filter.filter" placeholder="检查条件">
+        <el-form-item label="复核条件">
+          <el-select v-model="filter.filter" placeholder="复核条件">
             <el-option :value="0" label="无"></el-option>
             <el-option :value="1" label="客观题0分"></el-option>
             <el-option :value="2" label="客观题0分，主观题有分"></el-option>
@@ -150,11 +150,11 @@
           @command="toBatchCheck"
         >
           <el-button type="primary" :disabled="!multipleSelection.length">
-            批量检查<i class="el-icon-arrow-down el-icon--right"></i>
+            批量复核<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="subjective">主观题检查</el-dropdown-item>
-            <el-dropdown-item command="objective">客观题检查</el-dropdown-item>
+            <el-dropdown-item command="subjective">主观题复核</el-dropdown-item>
+            <el-dropdown-item command="objective">客观题复核</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -231,14 +231,14 @@
           label="主观题明细"
           min-width="240"
         ></el-table-column>
-        <el-table-column prop="checkUserName" label="检查人" min-width="140">
+        <el-table-column prop="checkUserName" label="复核人" min-width="140">
           <span slot-scope="scope"
             >{{ scope.row.checkUserName | defaultFieldFilter }}（{{
               scope.row.checkUserLoginName | defaultFieldFilter
             }}）</span
           ></el-table-column
         >
-        <el-table-column prop="checkTime" label="检查时间" width="170">
+        <el-table-column prop="checkTime" label="复核时间" width="170">
           <span slot-scope="scope">{{
             scope.row.checkTime | timestampFilter
           }}</span>
@@ -267,14 +267,14 @@
               type="text"
               :disabled="!scope.row.subjectiveCheckFlag"
               @click="toCheckQuestion(scope.row, 'subjective')"
-              >主观题检查</el-button
+              >主观题复核</el-button
             >
             <el-button
               class="btn-primary"
               type="text"
               :disabled="!scope.row.objectiveCheckFlag"
               @click="toCheckQuestion(scope.row, 'objective')"
-              >客观题检查</el-button
+              >客观题复核</el-button
             >
           </template>
         </el-table-column>
@@ -415,7 +415,7 @@ export default {
           .filter((item) => item.objectiveCheckFlag)
           .map((item) => item.studentId);
         if (!studentIds.length) {
-          this.$message.error("没有可检查数据！");
+          this.$message.error("没有可复核数据！");
           return;
         }
 
@@ -425,7 +425,7 @@ export default {
           .filter((item) => item.subjectiveCheckFlag)
           .map((item) => item.studentId);
         if (!studentIds.length) {
-          this.$message.error("没有可检查数据！");
+          this.$message.error("没有可复核数据！");
           return;
         }
         this.toMarkSubjectiveAnswer({

src/modules/mark/components/markParam/ModifyMarkGroup.vue

@@ -264,7 +264,7 @@ export default {
       modalIsShow: false,
       SCORE_POLICY_TYPE,
       filterLabel: "",
-      userType: "course",
+      userType: "org",
       courseUsers: [],
       orgUsers: [],
       userTree: [],