Commit 5d1e3cc1b5d6a01d48bab77a751f8609273ee942

Authored by xp.Huang
2 parents 3ca746d2 0e74415e

Merge branch 'fix/DEFECT-1759' into 'main_dev'

fix: 产品分类字段换成产品品类

See merge request yunteng/thingskit-front!1014
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 const emit = defineEmits(['handleReload', 'register']); 11 const emit = defineEmits(['handleReload', 'register']);
12 12
13 const isUpdate = ref<Boolean>(false); 13 const isUpdate = ref<Boolean>(false);
14 - const getTitle = computed(() => (!unref(isUpdate) ? '新增分类' : '编辑分类')); 14 + const getTitle = computed(() => (!unref(isUpdate) ? '新增品类' : '编辑品类'));
15 const { createMessage } = useMessage(); 15 const { createMessage } = useMessage();
16 16
17 const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({ 17 const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
@@ -27,7 +27,7 @@ export const searchFormSchema: FormSchema[] = [ @@ -27,7 +27,7 @@ export const searchFormSchema: FormSchema[] = [
27 colProps: { span: 6 }, 27 colProps: { span: 6 },
28 componentProps: { 28 componentProps: {
29 maxLength: 255, 29 maxLength: 255,
30 - placeholder: '请输入类名称', 30 + placeholder: '请输入类名称',
31 }, 31 },
32 }, 32 },
33 { 33 {
@@ -40,7 +40,7 @@ export const searchFormSchema: FormSchema[] = [ @@ -40,7 +40,7 @@ export const searchFormSchema: FormSchema[] = [
40 { label: '启用', value: '1' }, 40 { label: '启用', value: '1' },
41 { label: '禁用', value: '0' }, 41 { label: '禁用', value: '0' },
42 ], 42 ],
43 - placeholder: '请选择类状态', 43 + placeholder: '请选择类状态',
44 }, 44 },
45 }, 45 },
46 { 46 {
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 registerTable, 24 registerTable,
25 { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection }, 25 { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
26 ] = useTable({ 26 ] = useTable({
27 - title: '产品类列表', 27 + title: '产品类列表',
28 api: getDeviceClassList, 28 api: getDeviceClassList,
29 columns, 29 columns,
30 formConfig: { 30 formConfig: {
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 <BasicTable style="flex: auto" @register="registerTable"> 129 <BasicTable style="flex: auto" @register="registerTable">
130 <template #toolbar> 130 <template #toolbar>
131 <Authority value="api:yt:product:category:post"> 131 <Authority value="api:yt:product:category:post">
132 - <Button type="primary" @click="handleCreate"> 新增类 </Button> 132 + <Button type="primary" @click="handleCreate"> 新增类 </Button>
133 </Authority> 133 </Authority>
134 <Authority value="api:yt:product:category:delete"> 134 <Authority value="api:yt:product:category:delete">
135 <Popconfirm 135 <Popconfirm