Commit 5298311dd4c5fc5cdf8ed041d4c9ff6053ba056c
1 parent
bb4343f1
chore: 优化用户禁用文案
Showing
3 changed files
with
7 additions
and
3 deletions
src/views/project/account/account.data.tsx
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [ | @@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [ | ||
33 | width: 200, | 33 | width: 200, |
34 | customRender: (column) => { | 34 | customRender: (column) => { |
35 | const { record } = column || {}; | 35 | const { record } = column || {}; |
36 | - return record.status === 10 ? <Tag color="green">启用</Tag> : <Tag color="red">禁用</Tag>; | 36 | + return record.status === 10 ? <Tag color="green">正常</Tag> : <Tag color="red">离职</Tag>; |
37 | }, | 37 | }, |
38 | }, | 38 | }, |
39 | { | 39 | { |
src/views/project/account/index.vue
@@ -31,9 +31,12 @@ | @@ -31,9 +31,12 @@ | ||
31 | { | 31 | { |
32 | // icon: 'ant-design:delete-outlined', | 32 | // icon: 'ant-design:delete-outlined', |
33 | color: 'error', | 33 | color: 'error', |
34 | - label: record.status === 10 ? '禁用' : '启用', | 34 | + label: record.status === 10 ? '离职' : '启用', |
35 | popConfirm: { | 35 | popConfirm: { |
36 | - title: record.status === 10 ? '是否确认禁用' : '是否确认启用', | 36 | + title: |
37 | + record.status === 10 | ||
38 | + ? '是否确认离职该用户,离职用户无法通过忘记密码进行手机验证码修改密码。请管理员重置其账号密码并修改。' | ||
39 | + : '是否确认启用', | ||
37 | placement: 'left', | 40 | placement: 'left', |
38 | confirm: handleForbid.bind(null, record), | 41 | confirm: handleForbid.bind(null, record), |
39 | }, | 42 | }, |
src/views/project/order/tableData.tsx
@@ -1135,6 +1135,7 @@ export const FIELDS_INSPECTION_INFO = [ | @@ -1135,6 +1135,7 @@ export const FIELDS_INSPECTION_INFO = [ | ||
1135 | component: 'Select', | 1135 | component: 'Select', |
1136 | optionField: 'midCheckResult', | 1136 | optionField: 'midCheckResult', |
1137 | label: '中期验货结果PASS / FAIL', | 1137 | label: '中期验货结果PASS / FAIL', |
1138 | + labelWidth: 400, | ||
1138 | // rules: [{ required: true }], | 1139 | // rules: [{ required: true }], |
1139 | }, | 1140 | }, |
1140 | { | 1141 | { |