刘洋 1 year ago
parent
commit
b451d66f57

+ 18 - 16
src/modules/admin-user/bulk-add-user/index.vue

@@ -79,7 +79,7 @@ const rules = computed<EpFormRules>(() => {
       { pattern: /[0-9a-zA-Z~!@#¥%&\*]/, message: '密码限制"数字、字母、~!@#¥%&\*"' },
     ],
     enable: [{ required: true, message: '请选择用户状态' }],
-    stage: [{ required: true, message: '请选择评卷阶段' }],
+    stage: model.role === 'MARKER' ? [{ required: true, message: '请选择评卷阶段' }] : [],
     markingGroupAccounts: [
       { required: true, message: '请填写分组账号数量' },
       { type: 'number', min: 0, max: 999999, message: '分组账号数量限制0-999999之间' },
@@ -252,21 +252,23 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '设置用户密码',
       },
     }),
-    span7({
-      rowKey: 'row-8',
-      label: '阶段',
-      slotType: 'select',
-      prop: 'stage',
-      slot: {
-        placeholder: '选择阶段',
-        options: [
-          { label: 'SAMPLE_A', value: 'SAMPLE_A' },
-          { label: 'SAMPLE_B', value: 'SAMPLE_B' },
-          { label: '强制考核卷', value: 'FORCE' },
-          { label: '正评', value: 'FORMAL' },
-        ],
-      },
-    }),
+    model.role === 'MARKER'
+      ? span7({
+          rowKey: 'row-8',
+          label: '阶段',
+          slotType: 'select',
+          prop: 'stage',
+          slot: {
+            placeholder: '选择阶段',
+            options: [
+              { label: 'SAMPLE_A', value: 'SAMPLE_A' },
+              { label: 'SAMPLE_B', value: 'SAMPLE_B' },
+              // { label: '强制考核卷', value: 'FORCE' },
+              { label: '正评', value: 'FORMAL' },
+            ],
+          },
+        })
+      : null,
     span7({
       rowKey: 'row-9',
       label: '状态',

+ 17 - 15
src/modules/admin-user/edit-user/index.vue

@@ -76,7 +76,7 @@ const rules = computed<EpFormRules>(() => {
       { pattern: /[0-9a-zA-Z~!@#¥%&\*]/, message: '密码限制"数字、字母、~!@#¥%&\*"' },
     ],
     enable: [{ required: true, message: '请选择用户状态' }],
-    stage: [{ required: true, message: '请选择评卷阶段' }],
+    stage: model.role === 'MARKER' ? [{ required: true, message: '请选择评卷阶段' }] : [],
     name: [{ type: 'string', max: 50, message: '用户名称限制50字以内' }],
   }
 })
@@ -226,20 +226,22 @@ const items = computed<EpFormItem[]>(() => {
         placeholder: '设置用户姓名',
       },
     },
-    {
-      label: '阶段',
-      slotType: 'select',
-      prop: 'stage',
-      slot: {
-        placeholder: '选择阶段',
-        options: [
-          { label: 'SAMPLE_A', value: 'SAMPLE_A' },
-          { label: 'SAMPLE_B', value: 'SAMPLE_B' },
-          { label: '强制考核卷', value: 'FORCE' },
-          { label: '正评', value: 'FORMAL' },
-        ],
-      },
-    },
+    model.role === 'MARKER'
+      ? {
+          label: '阶段',
+          slotType: 'select',
+          prop: 'stage',
+          slot: {
+            placeholder: '选择阶段',
+            options: [
+              { label: 'SAMPLE_A', value: 'SAMPLE_A' },
+              { label: 'SAMPLE_B', value: 'SAMPLE_B' },
+              // { label: '强制考核卷', value: 'FORCE' },
+              { label: '正评', value: 'FORMAL' },
+            ],
+          },
+        }
+      : null,
     {
       label: '状态',
       slotType: 'select',