zhangjie 1 year ago
parent
commit
079b311d59

+ 18 - 16
src/modules/client/components/HandleInputDialog.vue

@@ -10,20 +10,22 @@
     append-to-body
     @open="visibleChange"
   >
-    <el-form
-      ref="modalFormComp"
-      :model="modalForm"
-      :rules="rules"
-      label-width="80px"
-    >
-      <el-form-item prop="studentCode" label="学号:">
-        <el-input
-          v-model.trim="modalForm.studentCode"
-          placeholder="请输入第一张试卷学号"
-          clearable
-        ></el-input>
-      </el-form-item>
-    </el-form>
+    <div @keyup.enter.prevent>
+      <el-form
+        ref="modalFormComp"
+        :model="modalForm"
+        :rules="rules"
+        label-width="80px"
+      >
+        <el-form-item prop="studentCode" label="学号:">
+          <el-input
+            v-model.trim="modalForm.studentCode"
+            placeholder="请输入第一张试卷学号"
+            clearable
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
     <div slot="footer">
       <el-button type="primary" @click="submit">确认</el-button>
     </div>
@@ -45,8 +47,8 @@ export default {
             trigger: "change",
           },
           {
-            message: "学号只能由数字、字母和下划线组成,长度3-30个字符",
-            pattern: /^[a-zA-Z0-9_-]{3,30}$/,
+            message: "学号只能由数字、字母和下划线组成,长度1-30个字符",
+            pattern: /^[a-zA-Z0-9_-]{1,30}$/,
             trigger: "change",
           },
         ],

+ 2 - 4
src/modules/client/components/ScanTaskProcessDialog.vue

@@ -303,8 +303,7 @@ export default {
       }).catch(() => {});
       if (res !== "confirm") return;
 
-      this.scanStageList = [];
-      this.scanStatus = "INIT";
+      this.initData();
       this.clearFiles();
       logger.info(`99数据清空`);
       this.$message.success("数据已清空!");
@@ -356,8 +355,7 @@ export default {
       this.saving = false;
       logger.info(`04-2保存数据成功`);
       this.clearFiles();
-      this.scanStatus = "INIT";
-      this.scanStageList = [];
+      this.initData();
     },
     clearFiles() {
       clearDir(this.GLOBAL.input);