考生信息场次相关功能修改

src/modules/examwork/view/examInfo.vue

@@ -217,12 +217,13 @@
                     <el-dropdown-item>
                       <el-button
                         :disabled="
-                          rolePrivileges.update_exam &&
-                            (scope.row.examType == 'OFFLINE' ||
-                              scope.row.examType == 'ONLINE' ||
+                          !(
+                            rolePrivileges.update_exam &&
+                            (scope.row.examType == 'ONLINE' ||
                               scope.row.examType == 'ONLINE_HOMEWORK') &&
                             scope.row.specialSettingsEnabled &&
                             scope.row.specialSettingsType == 'STAGE_BASED'
+                          )
                         "
                         size="mini"
                         type="primary"

src/modules/examwork/view/examStudent.vue

@@ -14,14 +14,34 @@
               filterable
               v-model="formSearch.examId"
               placeholder="请选择"
+              @change="handleExamChange4Search"
             >
               <el-option
                 v-for="item in examList4Search"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
-              >
-              </el-option>
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="场次">
+            <el-select
+              clearable
+              :disabled="examStageDisabled4Search"
+              class="input"
+              :remote-method="queryExamStages4Search"
+              remote
+              :loading="queryExamStages4SearchLoading"
+              :filterable="false"
+              v-model="formSearch.examStageId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in examStageList4Search"
+                :label="item.stageOrder"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="姓名">
@@ -61,8 +81,7 @@
                 :label="item.name + ' - ' + item.code"
                 :value="item.id"
                 :key="item.id"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="学习中心">
@@ -82,8 +101,7 @@
                 :label="item.name + ' - ' + item.code"
                 :value="item.id"
                 :key="item.id"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="采集人">
@@ -123,39 +141,38 @@
               type="primary"
               icon="el-icon-search"
               @click="resetPageAndSearchForm"
-              >查询
-            </el-button>
+              >查询</el-button
+            >
             <el-button
               size="small"
               icon="el-icon-refresh"
               @click="resetSearchForm"
+              >重置</el-button
             >
-              重置
-            </el-button>
             <el-button
               v-if="rolePrivileges.add_examStudent"
               size="small"
               type="primary"
               icon="el-icon-plus"
               @click="openAddingDialog"
-              >新增
-            </el-button>
+              >新增</el-button
+            >
             <el-button
               v-if="rolePrivileges.del_examStudent"
               size="small"
               type="danger"
               icon="el-icon-delete"
               @click="deleteStuByExam"
-              >批次删除
-            </el-button>
+              >批次删除</el-button
+            >
             <el-button
               v-if="rolePrivileges.copy_examStudent"
               size="small"
               type="primary"
               icon="el-icon-document"
               @click="copy"
-              >复制
-            </el-button>
+              >复制</el-button
+            >
           </el-form-item>
         </el-form>
 
@@ -189,8 +206,8 @@
             icon="el-icon-delete"
             @click="deleteStuBatch"
             :disabled="noBatchSelected"
-            >删除
-          </el-button>
+            >删除</el-button
+          >
         </div>
 
         <div style="width: 100%;margin-bottom: 10px;"></div>
@@ -220,6 +237,7 @@
                 clearable
                 v-model="examStudentForm.examId"
                 placeholder="请选择"
+                @change="handleExamChange4InsertOrUpdate"
               >
                 <el-option
                   v-for="item in examList4InsertOrUpdate"
@@ -227,8 +245,27 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="场次">
+              <el-select
+                class="input"
+                :disabled="examStageDisabled4Insert"
+                :remote-method="queryExamStages4InsertOrUpdate"
+                remote
+                clearable
+                :loading="queryExamStages4InsertOrUpdateLoading"
+                :filterable="false"
+                v-model="examStudentForm.examStageId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in examStageList4InsertOrUpdate"
+                  :label="item.stageOrder"
+                  :value="item.id"
+                  :key="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="姓名" prop="studentName">
@@ -273,8 +310,7 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="课程" prop="courseId">
@@ -294,8 +330,7 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="试卷类型" prop="paperType">
@@ -309,8 +344,7 @@
                   :label="item"
                   :value="item"
                   :key="item"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业">
@@ -399,8 +433,27 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="场次">
+              <el-select
+                class="input"
+                :disabled="examStageDisabled4Update"
+                :remote-method="queryExamStages4InsertOrUpdate"
+                remote
+                clearable
+                :loading="queryExamStages4InsertOrUpdateLoading"
+                :filterable="false"
+                v-model="examStudentForm.examStageId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in examStageList4InsertOrUpdate"
+                  :label="item.stageOrder"
+                  :value="item.id"
+                  :key="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="姓名" prop="studentName">
@@ -446,8 +499,7 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="课程" prop="courseId">
@@ -468,8 +520,7 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="试卷类型" prop="paperType">
@@ -483,8 +534,7 @@
                   :label="item"
                   :value="item"
                   :key="item"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业">
@@ -570,8 +620,7 @@
                   :label="item.name"
                   :value="item.id"
                   :key="item.id"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="目标考试批次" prop="targetExamId">
@@ -591,8 +640,7 @@
                   :value="item.id"
                   :key="item.id"
                   :disabled="!item.enable"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
             <div style="text-align: center;">
@@ -712,33 +760,48 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="studentCode" label="学号" sortable>
-          </el-table-column>
-          <el-table-column prop="ext2" label="身份证号" width="120" sortable>
-          </el-table-column>
-          <el-table-column prop="orgName" label="学习中心" width="120" sortable>
-          </el-table-column>
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            sortable
+          ></el-table-column>
+          <el-table-column
+            prop="ext2"
+            label="身份证号"
+            width="120"
+            sortable
+          ></el-table-column>
+          <el-table-column
+            prop="orgName"
+            label="学习中心"
+            width="120"
+            sortable
+          ></el-table-column>
           <el-table-column
             prop="examName"
             label="考试名称"
             width="120"
             sortable
-          >
-          </el-table-column>
+          ></el-table-column>
+          <el-table-column
+            v-if="!examStageDisabled4Search"
+            prop="examStageOrder"
+            label="场次"
+            width="120"
+            sortable
+          ></el-table-column>
           <el-table-column
             prop="courseName"
             label="课程名称"
             width="120"
             sortable
-          >
-          </el-table-column>
+          ></el-table-column>
           <el-table-column
             prop="updateTime"
             width="155"
             label="更新时间"
             sortable
-          >
-          </el-table-column>
+          ></el-table-column>
           <el-table-column width="50" label="状态">
             <span slot-scope="scope">
               <span v-if="scope.row.enable">
@@ -774,9 +837,8 @@
                   :disabled="!scope.row.photoPath"
                   icon="el-icon-picture"
                   @click="showPhoto(scope.row)"
+                  >查看照片</el-button
                 >
-                  查看照片
-                </el-button>
                 <el-button
                   v-if="rolePrivileges.update_examStudent"
                   size="mini"
@@ -784,9 +846,8 @@
                   plain
                   icon="el-icon-edit"
                   @click="openUpdateDialog(scope.row)"
+                  >编辑</el-button
                 >
-                  编辑
-                </el-button>
 
                 <el-dropdown
                   style="margin-left: 10px;"
@@ -796,7 +857,8 @@
                   "
                 >
                   <el-button type="primary" plain size="mini">
-                    更多<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>
@@ -806,9 +868,9 @@
                         type="danger"
                         icon="el-icon-delete"
                         @click="deleteExamStudent(scope.row)"
-                        >删除
-                      </el-button></el-dropdown-item
-                    >
+                        >删除</el-button
+                      >
+                    </el-dropdown-item>
                     <el-dropdown-item>
                       <el-button
                         v-if="
@@ -821,8 +883,8 @@
                         plain
                         icon="el-icon-check"
                         @click="enableExamStudent(scope.row)"
-                        >启用
-                      </el-button>
+                        >启用</el-button
+                      >
                       <el-button
                         v-else-if="
                           rolePrivileges.change_exam_student_availability
@@ -831,8 +893,8 @@
                         type="danger"
                         icon="el-icon-close"
                         @click="disableExamStudent(scope.row)"
-                        >禁用
-                      </el-button>
+                        >禁用</el-button
+                      >
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -849,8 +911,7 @@
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
-          >
-          </el-pagination>
+          ></el-pagination>
         </div>
 
         <el-dialog title="错误提示" v-model="errDialog">
@@ -939,9 +1000,11 @@ export default {
       uploadHeaders: {},
       orgList4Search: [],
       getOrgList4SearchLoading: false,
+      examInfo4Search: null,
       formSearch: {
         rootOrgId: "",
         examId: "",
+        examStageId: "",
         studentCode: "",
         studentName: "",
         orgId: "",
@@ -962,12 +1025,18 @@ export default {
       examList4CopyFrom: [],
       examList4CopyTo: [],
 
+      examStageList4Search: [],
+      examStageList4InsertOrUpdate: [],
+
       queryExams4SearchLoading: false,
       queryExams4InsertOrUpdateLoading: false,
       queryExams4ImportLoading: false,
       queryExams4CopyFromLoading: false,
       queryExams4CopyToLoading: false,
 
+      queryExamStages4SearchLoading: false,
+      queryExamStages4InsertOrUpdateLoading: false,
+
       selectedExamStuIds: [],
       addingStudentDialog: false,
       updateStudentDialog: false,
@@ -988,6 +1057,7 @@ export default {
       examStudentForm: {
         id: null,
         examId: "",
+        examStageId: "",
         courseId: null,
         studentId: null,
         studentName: "",
@@ -1029,7 +1099,11 @@ export default {
           { required: true, message: "请输入姓名", trigger: "blur" }
         ],
         identityNumber: [
-          { required: true, validator: validateIdentityNumber, trigger: "blur" }
+          {
+            required: true,
+            validator: validateIdentityNumber,
+            trigger: "blur"
+          }
         ],
         courseId: [
           {
@@ -1066,7 +1140,10 @@ export default {
             trigger: "change"
           }
         ]
-      }
+      },
+      examStageDisabled4Search: true,
+      examStageDisabled4Insert: true,
+      examStageDisabled4Update: true
     };
   },
 
@@ -1155,6 +1232,42 @@ export default {
           }
         });
     },
+
+    queryExamStages4Search(name) {
+      this.queryExamStages(this.formSearch.examId, name, "search");
+    },
+    queryExamStages4InsertOrUpdate(name) {
+      this.queryExamStages(this.examStudentForm.examId, name, "insertOrUpdate");
+    },
+    queryExamStages(examId, name, where) {
+      console.log("queryExams; name: " + name);
+
+      this.$httpWithMsg
+        .get(
+          EXAM_WORK_API +
+            "/examStage/queryByNameLike?examId=" +
+            examId +
+            "&enable=true&name=" +
+            name
+        )
+        .then(response => {
+          if ("search" == where) {
+            this.queryExamStages4SearchLoading = false;
+            this.examStageList4Search = response.data;
+          } else if ("insertOrUpdate" == where) {
+            this.queryExamStages4InsertOrUpdateLoading = false;
+            this.examStageList4InsertOrUpdate = response.data;
+          }
+        })
+        .catch(response => {
+          console.log(response);
+          if ("search" == where) {
+            this.queryExamStages4SearchLoading = false;
+          } else if ("insertOrUpdate" == where) {
+            this.queryExamStages4InsertOrUpdateLoading = false;
+          }
+        });
+    },
     getOrgList4Search(orgName) {
       this.getOrgList(orgName, "search");
     },
@@ -1772,6 +1885,44 @@ export default {
           // this.searchForm();
         });
       }
+    },
+    handleExamChange4Search(value) {
+      if (this.examList4Search.length > 0) {
+        let examArr = this.examList4Search.filter(p => p.id == value);
+        if (examArr && examArr.length > 0) {
+          let exam = examArr[0];
+          if (
+            exam.specialSettingsEnabled &&
+            exam.specialSettingsType == "STAGE_BASED"
+          ) {
+            this.examStageDisabled4Search = false;
+            this.examStageDisabled4Update = false; //编辑同查询一致，考试批次不可修改
+            this.queryExamStages4Search("");
+            this.queryExamStages(value, "", "insertOrUpdate");
+          } else {
+            this.examStageList4Search = [];
+            this.examStageDisabled4Search = true;
+            this.examStageDisabled4Update = true;
+          }
+        }
+      }
+    },
+    handleExamChange4InsertOrUpdate(value) {
+      if (this.examList4InsertOrUpdate.length > 0) {
+        let examArr = this.examList4InsertOrUpdate.filter(p => p.id == value);
+        if (examArr && examArr.length > 0) {
+          let exam = examArr[0];
+          if (
+            exam.specialSettingsEnabled &&
+            exam.specialSettingsType == "STAGE_BASED"
+          ) {
+            this.examStageDisabled4Insert = false;
+            this.queryExamStages4InsertOrUpdate("");
+          } else {
+            this.examStageDisabled4Insert = true;
+          }
+        }
+      }
     }
   },
   created() {

src/modules/examwork/view/offlineExam.vue

@@ -160,7 +160,7 @@
                       class="input"
                     >
                       <el-radio label="ORG_BASED">机构特殊设置</el-radio>
-                      <el-radio label="STAGE_BASED">场次特殊设置</el-radio>
+                      <!-- <el-radio label="STAGE_BASED">场次特殊设置</el-radio> -->
                     </el-radio-group>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/stageSpecialSettings.vue

@@ -882,7 +882,14 @@ export default {
           });
         }
       } else {
-        debugger;
+        if (this.addStageForm.timeRange0.length == 0) {
+          this.$notify({
+            showClose: true,
+            message: "日期范围不允许为空",
+            type: "error"
+          });
+          return;
+        }
         //按天创建
         let st0 = this.addStageForm.timeRange0[0];
         let et0 = this.addStageForm.timeRange0[1];