zhangjie 3 lat temu
rodzic
commit
ef472632a1

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

@@ -37,6 +37,13 @@
           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%;"
@@ -71,6 +78,7 @@ const initModalForm = {
   id: "",
   loginName: "",
   realName: "",
+  code: "",
   mobileNumber: "",
   roleIds: []
 };
@@ -137,6 +145,18 @@ export default {
             trigger: "change"
           }
         ],
+        code: [
+          {
+            required: true,
+            message: "请输入工号",
+            trigger: "change"
+          },
+          {
+            max: 50,
+            message: "工号不能超过50",
+            trigger: "change"
+          }
+        ],
         roleIds: [
           {
             required: true,

+ 1 - 1
src/modules/admin/views/AdminUserManage.vue

@@ -61,7 +61,7 @@
             {{ scope.row.enable | enableFilter }}
           </template>
         </el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="120px">
+        <el-table-column class-name="action-column" label="操作" width="200px">
           <template slot-scope="scope">
             <el-button
               class="btn-primary"

+ 10 - 7
src/modules/customer/views/CustomerCard.vue

@@ -18,8 +18,11 @@
               (!AUDITED && checkPrivilege('condition', 'notReviewCondition'))
           "
         >
-          <el-form-item label="学校名称:">
-            <school-select v-model="filter.schoolId"></school-select>
+          <el-form-item label="学校:">
+            <school-select
+              v-model="filter.schoolId"
+              placeholder="学校"
+            ></school-select>
           </el-form-item>
           <!-- <el-form-item label="试卷编号:">
           <paper-number-select
@@ -43,8 +46,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="申请开始时间"
+              end-placeholder="申请结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -57,8 +60,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="完成开始时间"
+              end-placeholder="完成结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -127,7 +130,7 @@
             scope.row.updateTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="120">
+        <el-table-column class-name="action-column" label="操作" width="140">
           <template slot-scope="scope">
             <el-button
               v-if="AUDITED && checkPrivilege('link', 'reviewPreview')"