xiaofei 1 anno fa
parent
commit
115a624aac

+ 0 - 19
src/modules/admin/components/ModifyUser.vue

@@ -37,13 +37,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <!-- <el-form-item prop="code" label="工号:">
-        <el-input
-          v-model.trim="modalForm.code"
-          placeholder="请输入工号"
-          clearable
-        ></el-input>
-      </el-form-item> -->
       <el-form-item prop="roleIds" label="角色:">
         <el-select
           style="width: 100%"
@@ -146,18 +139,6 @@ export default {
             trigger: "change",
           },
         ],
-        // code: [
-        //   {
-        //     required: true,
-        //     message: "请输入工号",
-        //     trigger: "change",
-        //   },
-        //   {
-        //     max: 50,
-        //     message: "工号不能超过50",
-        //     trigger: "change",
-        //   },
-        // ],
         roleIds: [
           {
             required: true,

+ 2 - 2
src/modules/base/components/ModifyOrgAdmin.vue

@@ -16,7 +16,7 @@
       <el-table>
         <el-table-column prop="realName" label="姓名"></el-table-column>
         <el-table-column prop="realName" label="手机号"></el-table-column>
-        <el-table-column prop="realName" label="工号"></el-table-column>
+        <el-table-column prop="realName" label="用户名/工号"></el-table-column>
         <el-table-column prop="realName" label="角色"></el-table-column>
         <el-table-column prop="realName" label="部门"></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="120px">
@@ -59,7 +59,7 @@
       <table>
         <el-table-column prop="realName" label="姓名"></el-table-column>
         <el-table-column prop="realName" label="手机号"></el-table-column>
-        <el-table-column prop="realName" label="工号"></el-table-column>
+        <el-table-column prop="realName" label="用户名/工号"></el-table-column>
         <el-table-column prop="realName" label="角色"></el-table-column>
         <el-table-column prop="realName" label="部门"></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="120px">

+ 1 - 1
src/modules/base/components/ModifyRoleUser.vue

@@ -40,7 +40,7 @@
             :index="indexMethod"
           ></el-table-column>
           <el-table-column prop="realName" label="姓名"> </el-table-column>
-          <el-table-column prop="code" label="工号"> </el-table-column>
+          <el-table-column prop="code" label="用户名/工号"> </el-table-column>
           <el-table-column prop="mobileNumber" label="手机号">
           </el-table-column>
           <el-table-column class-name="action-column" label="操作" width="80">

+ 0 - 19
src/modules/base/components/ModifyUser.vue

@@ -30,13 +30,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <!-- <el-form-item prop="code" label="工号:">
-        <el-input
-          v-model.trim="modalForm.code"
-          placeholder="请输入工号"
-          clearable
-        ></el-input>
-      </el-form-item> -->
       <el-form-item prop="mobileNumber" label="手机号:">
         <el-input
           v-model.trim="modalForm.mobileNumber"
@@ -204,18 +197,6 @@ export default {
             trigger: "change",
           },
         ],
-        // code: [
-        //   {
-        //     required: true,
-        //     message: "请输入工号",
-        //     trigger: "change",
-        //   },
-        //   {
-        //     max: 50,
-        //     message: "工号不能超过50",
-        //     trigger: "change",
-        //   },
-        // ],
         roleIds: [
           {
             required: true,

+ 3 - 3
src/modules/base/components/course-simple/ModifyTeacherSimple.vue

@@ -36,10 +36,10 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item prop="teacherCode" label="工号:">
+        <el-form-item prop="teacherCode" label="用户名/工号:">
           <el-input
             v-model.trim="modalForm.teacherCode"
-            placeholder="请输入工号"
+            placeholder="请输入用户名/工号"
             clearable
           ></el-input>
         </el-form-item>
@@ -147,7 +147,7 @@ export default {
           {
             required: true,
             pattern: /^[0-9a-zA-Z_-]{3,30}$/,
-            message: "工号只能由数字字母短横线组成,长度在3-30之间",
+            message: "用户名/工号只能由数字字母短横线组成,长度在3-30之间",
             trigger: "change",
           },
         ],

+ 1 - 1
src/modules/base/components/course-simple/SelectSimpleTeacher.vue

@@ -46,7 +46,7 @@
       ></el-table-column>
       <el-table-column
         prop="code"
-        label="工号"
+        label="用户名/工号"
         min-width="120"
       ></el-table-column>
       <el-table-column

+ 2 - 2
src/modules/base/components/course-simple/TeacherSimpleManage.vue

@@ -5,7 +5,7 @@
         <el-form-item>
           <el-input
             v-model.trim="filter.userInfo"
-            placeholder="请输入姓名或工号"
+            placeholder="请输入姓名或用户名/工号"
             clearable
           ></el-input>
         </el-form-item>
@@ -41,7 +41,7 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="userName" label="姓名"></el-table-column>
-        <el-table-column prop="userCode" label="工号"></el-table-column>
+        <el-table-column prop="userCode" label="用户名/工号"></el-table-column>
         <el-table-column prop="roleName" label="角色"></el-table-column>
         <el-table-column prop="orgName" label="所在机构"></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="100px">

+ 0 - 6
src/modules/base/views/UserManage.vue

@@ -118,12 +118,6 @@
           label="姓名"
           width="120"
         ></el-table-column>
-        <!-- <el-table-column prop="code" label="工号"></el-table-column>
-        <el-table-column
-          prop="mobileNumber"
-          label="手机号"
-          width="120"
-        ></el-table-column> -->
         <el-table-column prop="orgName" label="所在机构"></el-table-column>
         <el-table-column prop="roles" label="角色">
           <template slot-scope="scope">

+ 5 - 0
src/modules/mark/views/MarkManage.vue

@@ -72,6 +72,11 @@
         <el-table-column prop="percent" label="完成进度" width="120">
           <span slot-scope="scope">{{ scope.row.percent || 0 }}%</span>
         </el-table-column>
+        <el-table-column
+          prop="omrAbsentCount"
+          label="识别缺考"
+          min-width="100"
+        ></el-table-column>
         <el-table-column
           prop="statusDisplay"
           label="评卷状态"