Merge branch 'dev_v4.0.2' into release_v4.0.2

# Conflicts:
#	src/modules/basic/view/user.vue

src/modules/basic/view/user.vue

@@ -9,19 +9,36 @@
         <!-- 搜索 -->
         <el-form inline :model="searchForm">
           <el-form-item v-if="isSuperAdmin" label="学校">
-            <SchoolSelectForRoot
+            <el-select
               v-model="searchForm.rootOrgId"
+              placeholder="请选择"
+              :disabled="!isSuperAdmin"
               class="input_width"
-              @change="() => (searchForm.roleId = '')"
-            />
+              filterable
+              @change="rootOrgChanged4Search"
+            >
+              <el-option
+                v-for="item in rootSchoolSelect"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="角色">
-            <RoleSelect
+            <el-select
               v-model="searchForm.roleId"
-              :school-id="searchForm.rootOrgId"
-              :enable-super="isSuperAdmin"
+              clearable
+              placeholder="请选择"
               class="input_width"
-            />
+            >
+              <el-option
+                v-for="item in roleList4Search"
+                :key="item.roleId"
+                :label="item.roleName"
+                :value="item.roleId"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="登录名">
             <el-input
@@ -74,7 +91,6 @@
             </el-button>
 
             <el-button
-              v-if="rolePrivileges.user_data_rule_setting"
               size="small"
               type="primary"
               icon="el-icon-plus"
@@ -101,13 +117,13 @@
           type="danger"
           icon="el-icon-close"
           :disabled="noBatchSelected"
-          @click="disableUsers"
+          @click="disableByIds"
           >禁用
         </el-button>
 
         <div class="block-seperator"></div>
         <!-- 添加用户信息弹出框 -->
-        <el-dialog title="新增用户" width="520px" :visible.sync="addingDialog">
+        <el-dialog title="新增用户" width="450px" :visible.sync="addingDialog">
           <el-form
             ref="addingForm"
             :inline="true"
@@ -159,22 +175,41 @@
             </el-row>
             <el-row>
               <el-form-item v-if="isSuperAdmin" label="学校" prop="rootOrgId">
-                <SchoolSelectForRoot
+                <el-select
                   v-model="userForm.rootOrgId"
                   class="input_width_lg"
-                  @change="() => (userForm.roleIds = '')"
-                />
+                  placeholder="请选择"
+                  :disabled="!isSuperAdmin"
+                  filterable
+                  @change="rootOrgChanged4InsertOrUpdate"
+                >
+                  <el-option
+                    v-for="item in rootSchoolSelect"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-row>
             <el-row>
               <el-form-item label="角色" prop="roleIds">
-                <RoleSelect
+                <el-select
                   v-model="userForm.roleIds"
-                  :school-id="userForm.rootOrgId"
-                  multiple
                   class="input_width_lg"
-                  @change="selectRoleChanged"
-                />
+                  multiple
+                  placeholder="请选择"
+                  @change="rolesChanged"
+                >
+                  <el-option
+                    v-for="item in roleList4InsertOrUpdateWithoutSuperAdmin"
+                    :key="item.roleId"
+                    :label="item.roleName"
+                    :value="item.roleId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-row>
             <el-row>
@@ -216,7 +251,7 @@
         </el-dialog>
 
         <!-- 修改用户信息弹出框 -->
-        <el-dialog title="编辑用户" width="520px" :visible.sync="updateDialog">
+        <el-dialog title="编辑用户" width="450px" :visible.sync="updateDialog">
           <el-form
             ref="updateForm"
             :inline="true"
@@ -267,22 +302,41 @@
             </el-row>
             <el-row>
               <el-form-item v-if="isSuperAdmin" label="学校" prop="rootOrgId">
-                <SchoolSelectForRoot
+                <el-select
                   v-model="userForm.rootOrgId"
                   class="input_width_lg"
-                  @change="() => (userForm.roleIds = '')"
-                />
+                  placeholder="请选择"
+                  :disabled="true"
+                >
+                  <el-option
+                    v-for="item in rootSchoolSelect"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-row>
             <el-row>
               <el-form-item label="角色" prop="roleIds">
-                <RoleSelect
+                <el-select
                   v-model="userForm.roleIds"
-                  :school-id="userForm.rootOrgId"
-                  multiple
                   class="input_width_lg"
-                  @change="selectRoleChanged"
-                />
+                  multiple
+                  placeholder="请选择"
+                  :disabled="rowIsSuperAdmin"
+                  @change="rolesChanged"
+                >
+                  <el-option
+                    v-for="item in roleList4InsertOrUpdate"
+                    :key="item.roleId"
+                    :label="item.roleName"
+                    :disabled="item.roleCode == 'SUPER_ADMIN'"
+                    :value="item.roleId"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-row>
             <el-row>
@@ -342,6 +396,7 @@
           <el-table-column prop="name" width="120" label="姓名" />
           <el-table-column prop="loginName" width="100" label="登录名" />
           <el-table-column prop="rootOrgName" label="学校" />
+          <!-- <el-table-column prop="roleNamesStr" width="110" label="角色" /> -->
           <el-table-column width="120" label="角色">
             <span
               slot-scope="scope"
@@ -396,7 +451,7 @@
                 size="mini"
                 type="danger"
                 icon="el-icon-close"
-                @click="disableTheUser(scope.row)"
+                @click="disableById(scope.row)"
               >
                 禁用
               </el-button>
@@ -492,13 +547,22 @@ export default {
         callback();
       }
     };
+    var validateRoles = (rule, value, callback) => {
+      if (value.length == 0) {
+        callback(new Error("请选择角色"));
+      } else {
+        callback();
+      }
+    };
     return {
       rolePrivileges: {
         user_data_rule_setting: false,
       },
       loading: false,
       orgLoading4InsertOrUpdate: false,
+      roleList4Search: [],
       roleList4InsertOrUpdate: [],
+      rootOrgList: [],
       orgList4InsertOrUpdate: [],
       searchForm: {
         name: "",
@@ -553,23 +617,24 @@ export default {
             trigger: "blur",
           },
         ],
+        phoneNumber: [
+          // {
+          //   message: "请输入联系方式",
+          //   trigger: "blur"
+          // }
+        ],
         rootOrgId: [
           {
             validator: validateRootOrg,
             trigger: "blur",
           },
         ],
-        orgId: [
-          {
-            required: "", // changed by role
-            message: "学习中心用户必须选择子机构",
-          },
-        ],
+        orgId: [],
         roleIds: [
           {
             required: true,
-            message: "请选择角色",
-            trigger: "blur",
+            validator: validateRoles,
+            trigger: ["blur", "change"],
           },
         ],
       },
@@ -593,19 +658,24 @@ export default {
     noBatchSelected() {
       return this.selectedUserIds.length === 0;
     },
+    roleList4InsertOrUpdateWithoutSuperAdmin() {
+      return this.roleList4InsertOrUpdate.filter(
+        (item) => item.roleCode != "SUPER_ADMIN"
+      );
+    },
     isSuperAdmin() {
       return this.user.roleList.some((role) => role.roleCode == "SUPER_ADMIN");
     },
-    isOrgAdminNotSuperAdmin() {
-      return (
-        this.user.roleList.some((role) => role.roleCode == "ORG_ADMIN") &&
-        !this.user.roleList.some((role) => role.roleCode == "SUPER_ADMIN")
-      );
-    },
-    isSuperAdminOrOrgAdmin() {
-      return this.user.roleList.some(
-        (role) => role.roleCode == "SUPER_ADMIN" || role.roleCode == "ORG_ADMIN"
-      );
+    rootSchoolSelect() {
+      let rootSchools = [];
+      for (let i = 0; i < this.rootOrgList.length; i++) {
+        let info = {
+          name: this.rootOrgList[i].name + "（" + this.rootOrgList[i].id + "）",
+          id: this.rootOrgList[i].id,
+        };
+        rootSchools.push(info);
+      }
+      return rootSchools;
     },
   },
   //初始化查询
@@ -614,14 +684,6 @@ export default {
     this.init();
   },
   methods: {
-    selectRoleChanged(selectRoles, roleList) {
-      const isLCUser = selectRoles.includes(
-        roleList.filter((v) => v.roleCode === "LC_USER").map((v) => v.roleId)[0]
-      );
-      this.rules.orgId[0].required = isLCUser;
-      this.$refs.addingForm && this.$refs.addingForm.validateField("orgId");
-      this.$refs.updateForm && this.$refs.updateForm.validateField("orgId");
-    },
     resetEcsFormSearch() {
       this.searchForm = Object.assign(this.searchForm, {
         roleId: "",
@@ -635,6 +697,71 @@ export default {
       this.pageSize = val;
       this.search();
     },
+    validateOrg(rule, value, callback) {
+      if (0 != value && !value) {
+        callback(new Error("请选择子机构"));
+      } else {
+        callback();
+      }
+    },
+    rolesChanged() {
+      var isLC = false;
+      for (let cur of this.roleList4InsertOrUpdate) {
+        if (
+          cur.roleCode == "LC_USER" &&
+          this.userForm.roleIds.includes(cur.roleId)
+        ) {
+          isLC = true;
+          break;
+        }
+      }
+      console.log("rolesChanged(); isLC:", isLC);
+      if (isLC) {
+        this.rules.orgId = [
+          {
+            validator: this.validateOrg,
+            trigger: ["blur", "change"],
+          },
+        ];
+      } else {
+        this.rules.orgId = [];
+        if (this.updateDialog) {
+          this.$refs.updateForm && this.$refs.updateForm.clearValidate("orgId");
+        } else if (this.addingDialog) {
+          this.$refs.addingForm && this.$refs.addingForm.clearValidate("orgId");
+        }
+      }
+      if (this.updateDialog) {
+        this.$refs.updateForm && this.$refs.updateForm.validateField("orgId");
+      } else if (this.addingDialog) {
+        this.$refs.addingForm && this.$refs.addingForm.validateField("orgId");
+      }
+    },
+    rootOrgChanged4Search() {
+      var url =
+        CORE_API +
+        "/rolePrivilege/getRoles?includeSuperAdmin=" +
+        true +
+        "&rootOrgId=" +
+        this.searchForm.rootOrgId;
+      this.$httpWithMsg.post(url).then((response) => {
+        this.roleList4Search = response.data;
+      });
+    },
+    rootOrgChanged4InsertOrUpdate() {
+      this.orgList4InsertOrUpdate = [];
+
+      var url =
+        CORE_API +
+        "/rolePrivilege/getRoles?includeSuperAdmin=" +
+        true +
+        "&rootOrgId=" +
+        this.userForm.rootOrgId;
+      this.$httpWithMsg.post(url).then((response) => {
+        this.roleList4InsertOrUpdate = response.data;
+        this.rolesChanged();
+      });
+    },
     getOrgList4InsertOrUpdate(query) {
       this.orgLoading4InsertOrUpdate = true;
       var url =
@@ -654,6 +781,22 @@ export default {
           this.orgLoading4InsertOrUpdate = false;
         });
     },
+    getTag(status) {
+      if (status == true) {
+        return "success";
+      } else if (status == false) {
+        return "danger";
+      }
+      return status;
+    },
+    getLevel(level) {
+      if (level == "ZSB") {
+        return "专升本";
+      } else if (level == "GQZ") {
+        return "高起专";
+      }
+      return level;
+    },
     handleSearchBtn() {
       this.currentPage = 1;
       this.search();
@@ -666,11 +809,6 @@ export default {
         }
       }, 500);
       var param = new URLSearchParams(this.searchForm);
-      if (!this.isSuperAdminOrOrgAdmin)
-        param.append("ignoreRoleCodes", "SUPER_ADMIN,ORG_ADMIN");
-      else if (this.isOrgAdminNotSuperAdmin) {
-        param.append("ignoreRoleCodes", "SUPER_ADMIN");
-      }
       var url =
         CORE_API +
         "/user/all/" +
@@ -704,14 +842,11 @@ export default {
     },
     //新增
     openAddingDialog() {
-      this.rules.orgId[0].required = false;
       if (this.$refs.addingForm) {
         this.$refs.addingForm.resetFields();
-        this.$refs.addingForm.clearValidate();
       }
       if (this.$refs.updateForm) {
         this.$refs.updateForm.resetFields();
-        this.$refs.updateForm.clearValidate();
       }
       this.addingDialog = true;
       this.userForm.name = "";
@@ -722,10 +857,10 @@ export default {
       this.userForm.orgId = null;
       this.enableStr = "true";
       this.orgList4InsertOrUpdate = [];
+      this.rolesChanged();
     },
     //修改
     openUpdateDialog(row) {
-      this.rules.orgId[0].required = row.roleCodes.includes("LC_USER");
       if (this.$refs.updateForm) {
         this.$refs.updateForm.resetFields();
       }
@@ -750,9 +885,14 @@ export default {
         }
       }
 
+      this.rootOrgChanged4InsertOrUpdate();
       this.orgList4InsertOrUpdate = [{ id: row.orgId, name: row.orgName }];
       this.userForm.orgId = row.orgId;
     },
+    exportUser() {
+      var param = new URLSearchParams(this.searchForm);
+      window.open(CORE_API + "/user/export?" + param);
+    },
     //保存
     add() {
       var url = CORE_API + "/user";
@@ -891,27 +1031,38 @@ export default {
         });
       });
     },
-    disableUsers() {
+    //禁用
+    disableByIds() {
       if (this.selectedUserIds.length === 0) {
         this.$notify({
           type: "warning",
           message: "请选择要禁用的用户",
         });
       } else {
-        this.disableByIds(this.userIds);
+        this.$confirm("是否禁用这些用户？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "error",
+        }).then(() => {
+          var url = CORE_API + "/user/disable/" + this.userIds;
+          this.$httpWithMsg.put(url, {}).then(() => {
+            this.$notify({
+              type: "success",
+              message: "禁用成功！",
+            });
+            this.search();
+          });
+        });
       }
     },
-    disableTheUser(user) {
-      this.disableByIds(user.id);
-    },
     //禁用
-    disableByIds(ids) {
-      this.$confirm("是否禁用用户？", "提示", {
+    disableById(row) {
+      this.$confirm("是否禁用该用户？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "error",
       }).then(() => {
-        var url = CORE_API + "/user/disable/" + ids;
+        var url = CORE_API + "/user/disable/" + row.id;
         this.$httpWithMsg.put(url, {}).then(() => {
           this.$notify({
             type: "success",
@@ -926,7 +1077,21 @@ export default {
       this.searchForm.rootOrgId = this.user.rootOrgId;
       this.userForm.rootOrgId = this.user.rootOrgId;
 
-      this.search();
+      var url1 = CORE_API + "/org/getRootOrgList";
+      var url2 =
+        CORE_API +
+        "/rolePrivilege/getRoles?includeSuperAdmin=true&rootOrgId=" +
+        this.user.rootOrgId;
+
+      Promise.all([
+        this.$httpWithMsg.get(url1),
+        this.$httpWithMsg.post(url2),
+      ]).then(([resp1, resp2]) => {
+        this.rootOrgList = resp1.data;
+        this.roleList4Search = resp2.data;
+        this.roleList4InsertOrUpdate = resp2.data;
+        this.search();
+      });
     },
     initPrivileges() {
       let params = new URLSearchParams();
@@ -944,24 +1109,26 @@ export default {
         return false;
       }
 
-      const isSuperOrOrgAdmin = row.roleCodes.includes((v) =>
-        ["SUPER_ADMIN", "ORG_ADMIN"].includes(v)
-      );
+      let roleCodes = row.roleCodes;
+      // console.log(JSON.stringify(roleCodes));
 
-      return !isSuperOrOrgAdmin;
+      for (let n = 0; n < roleCodes.length; n++) {
+        let roleCode = roleCodes[n];
+        if (roleCode == "SUPER_ADMIN" || roleCode == "ORG_ADMIN") {
+          return false;
+        }
+      }
+
+      return true;
     },
     copyPrevillegeDialog() {
       const refIds = this.$refs.table.selection;
-      if (refIds.length === 0 || refIds.length > 1) {
+      if (refIds.length === 0 || refIds > 1) {
         this.$notify({ type: "warning", message: "请先选择一行" });
         return;
       }
       this.selectedUserToCopy = refIds[0];
-      if (this.showUserDataRuleSetting(this.selectedUserToCopy)) {
-        this.$refs.copyPrevillegeDialog.openDialog();
-      } else {
-        this.$notify({ type: "warning", message: "当前行无权限复制" });
-      }
+      this.$refs.copyPrevillegeDialog.openDialog();
     },
   },
 };

src/modules/examwork/view/onlineExam.vue

@@ -412,6 +412,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.BEFORE_EXAM_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>
@@ -422,6 +423,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.AFTER_EXAM_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>
@@ -446,6 +448,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.CHEATING_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/onlineHomework.vue

@@ -395,6 +395,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.BEFORE_EXAM_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>
@@ -405,6 +406,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.AFTER_EXAM_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>
@@ -429,6 +431,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.CHEATING_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>

src/modules/examwork/view/practiceExam.vue

@@ -301,6 +301,7 @@
                   >
                     <ckeditor
                       v-model="form.properties.BEFORE_EXAM_REMARK"
+                      extrabuttons="Font,FontSize,TextColor"
                     ></ckeditor>
                   </el-form-item>
                 </el-row>

src/modules/oe/views/alreadyAudited.vue

@@ -115,6 +115,16 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <!--          <el-col :span="6">
+            <el-form-item label="Ip">
+              <el-input
+                v-model="form.ip"
+                class="form_search_width"
+                size="small"
+                placeholder="Ip"
+              ></el-input>
+            </el-form-item>
+          </el-col>-->
         </el-row>
       </commonFormVue>
       <el-col :span="24">
@@ -266,6 +276,12 @@
               prop="paperAuditTime"
               width="120"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="Ip"
+              prop="ip"
+              width="120"
+            ></el-table-column>
           </el-table>
           <div class="block pull-right">
             <el-pagination
@@ -324,6 +340,7 @@ export default {
         submitEndTime: null, //交卷时间止
         auditStartTime: null, //审核时间起
         auditEndTime: null, //审核时间止
+        ip: null, //Ip
       },
 
       getExamCondition: {

src/modules/oe/views/awaitingAudit.vue

@@ -123,6 +123,16 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <!--          <el-col :span="6">
+            <el-form-item label="Ip">
+              <el-input
+                v-model="form.ip"
+                class="form_search_width"
+                size="small"
+                placeholder="Ip"
+              ></el-input>
+            </el-form-item>
+          </el-col>-->
         </el-row>
       </commonFormVue>
       <el-col :span="24">
@@ -308,6 +318,12 @@
               prop="baiduFaceLivenessSuccessPercent"
               width="180"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="Ip"
+              prop="ip"
+              width="180"
+            ></el-table-column>
             <el-table-column
               v-if="currentPagePrivileges.PENDING_OPERATE"
               :context="_self"
@@ -443,6 +459,7 @@ export default {
         endTime: null, //开考时间止
         submitStartTime: null, //交卷时间起
         submitEndTime: null, //交卷时间止
+        ip: null, //Ip
       },
       auditForm: {
         examRecordDataId: null,
@@ -674,10 +691,11 @@ export default {
     },
     gotoCaptureDetail(examRecordDataId) {
       let pendingOperate = !this.currentPagePrivileges.PENDING_OPERATE;
+      let searchParam = JSON.parse(JSON.stringify(this.form));
       this.$router.push({
         path: "/oe/captureDetail/" + examRecordDataId + "/awaitingAudit",
         // name: "captureDetail",
-        query: { pendingOperate },
+        query: { pendingOperate, searchParam },
       });
     },
     backFill() {

src/modules/oe/views/captureDetail.vue

@@ -11,10 +11,19 @@
         </el-col>
         <el-col :span="19">
           <el-row>
-            <el-col :span="8" class="capture-title">
+            <el-col :span="6" class="capture-title">
               <span>监考数据ID:{{ examRecordDataId }}</span>
             </el-col>
-            <el-col :span="16" style="text-align: right">
+            <el-col :span="12" style="text-align: center">
+              <el-button
+                v-if="showAudit"
+                size="small"
+                type="warning"
+                icon="el-icon-d-arrow-left"
+                title="上一条"
+                @click="openNextAuditDetail('0')"
+                >上一条</el-button
+              >
               <el-button
                 v-if="showAudit"
                 size="small"
@@ -24,7 +33,6 @@
                 @click="auditPass"
                 >通过</el-button
               >
-
               <el-button
                 v-if="showAudit"
                 size="small"
@@ -34,6 +42,16 @@
                 @click="openAuditDialog"
                 >不通过</el-button
               >
+              <el-button
+                v-if="showAudit"
+                size="small"
+                type="warning"
+                title="下一条"
+                @click="openNextAuditDetail('1')"
+                >下一条<i class="el-icon-d-arrow-right el-icon--right"></i
+              ></el-button>
+            </el-col>
+            <el-col :span="6" style="text-align: right">
               <el-button
                 size="small"
                 icon="el-icon-arrow-left"
@@ -285,6 +303,10 @@ export default {
       currentPaths: ["抓拍详情"],
       disciplineTypeList: [],
       pendingOperate: false,
+      searchParam: {},
+      orderDesc: true,
+      first: false,
+      last: false,
       examProcessRecordData: [],
     };
   },
@@ -294,6 +316,7 @@ export default {
   created() {
     this.examRecordDataId = this.$route.params.examRecordDataId;
     this.pendingOperate = this.$route.query.pendingOperate;
+    this.searchParam = this.$route.query.searchParam;
     var fromPage = this.$route.params.from;
     var currentPathJson = {
       illegalityNameList: ["违纪名单", "抓拍详情"],
@@ -333,7 +356,7 @@ export default {
               isPendingAudit == "false" &&
               response.data.isWarn &&
               !response.data.isAudit;
-            this.examAuditData.push(response.data);
+            this.examAuditData = new Array(response.data);
             var studentId = response.data.studentId;
             this.syncCapturePhotoPath = response.data.syncCaptureFileUrl;
             this.getStudentInfo(studentId);
@@ -389,9 +412,37 @@ export default {
             message: "操作成功",
             type: "success",
           });
-          this.back();
+          this.openNextAuditDetail("");
         });
     },
+    /**
+     * 下一条
+     */
+    openNextAuditDetail(next) {
+      var url =
+        "/api/ecs_oe_admin/exam/record/waiting/audit/next?examRecordDataId=" +
+        this.examRecordDataId +
+        "&next=" +
+        next;
+      this.$http.post(url, this.searchParam).then((response) => {
+        if (response.data) {
+          this.examRecordDataId = response.data;
+          this.getExamAuditData();
+          this.listExamCapture();
+          this.getDisciplineTypeList("");
+          this.getExamProcessRecordData();
+        } else {
+          if (next == "") {
+            this.$notify({
+              title: "成功",
+              message: "全部审核完毕。",
+              type: "success",
+            });
+            this.back();
+          }
+        }
+      });
+    },
     openAuditDialog() {
       this.dialogFormVisible = true;
       this.auditForm = {
@@ -413,7 +464,7 @@ export default {
                 message: "操作成功",
                 type: "success",
               });
-              this.back();
+              this.openNextAuditDetail("");
             });
         } else {
           return false;

src/modules/oe/views/illegalityNameList.vue

@@ -24,6 +24,16 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <!--        <el-col :span="6">
+          <el-form-item label="Ip">
+            <el-input
+              v-model="form.ip"
+              class="form_search_width"
+              size="small"
+              placeholder="Ip"
+            ></el-input>
+          </el-form-item>
+        </el-col>-->
       </commonFormVue>
       <el-row>
         <el-col :span="24">
@@ -161,6 +171,12 @@
                 ></span>
               </template>
             </el-table-column>
+            <el-table-column
+              sortable
+              label="Ip"
+              prop="ip"
+              width="120"
+            ></el-table-column>
           </el-table>
           <div class="block pull-right">
             <el-pagination
@@ -213,6 +229,7 @@ export default {
         pageSize: 10,
         ORG_FIND_ALL: false, //查询所有机构
         examStageId: null,
+        ip: null,
       },
 
       getExamCondition: {