Merge branch 'fix/category' into 'main_dev'

fix:编辑产品时产品品类改为不能编辑

See merge request yunteng/thingskit-front!1009

@@ -5,14 +5,14 @@ import { DictEnum } from '/@/enums/dictEnum';
 
 export const columns: BasicColumn[] = [
   {
-    title: '领域',
-    dataIndex: 'dictItemName',
-  },
-  {
     title: '名称',
     dataIndex: 'name',
   },
   {
+    title: '领域',
+    dataIndex: 'dictItemName',
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     slots: { customRender: 'status' },

@@ -45,7 +45,7 @@
     rowSelection: {
       type: 'checkbox',
       getCheckboxProps: (record: any) => {
-        return { disabled: !!record.customerId };
+        return { disabled: !!record.status };
       },
     },
   });
@@ -166,6 +166,7 @@
               auth: 'api:yt:product:category:delete',
               icon: 'ant-design:delete-outlined',
               ifShow: authBtn(role) && !record.status,
+              color: 'error',
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),

@@ -240,7 +240,7 @@ export const step1Schemas: FormSchema[] = [
     field: 'categoryId',
     label: '产品品类',
     component: 'Input',
-    defaultValue: 1,
+    defaultValue: undefined,
     ifShow: false,
   },
   {

@@ -7,6 +7,7 @@
             v-model:value="model.categoryName"
             placeholder="请选择所属品类"
             style="width: 300px"
+            :disabled="cateGoryDisabled"
             @focus="handleFocus"
           />
           <Button type="link" :disabled="!model.categoryName" @click="handleCategoryId"
@@ -58,6 +59,8 @@
       submitFunc: customSubmitFunc,
     });
 
+  const cateGoryDisabled = ref<boolean>(false);
+
   const editOrAddNameStatus = (nameStatus) =>
     updateSchema({
       field: 'name',
@@ -77,7 +80,7 @@
     emits('emitDeviceType', values?.deviceType);
   }
   //回显数据
-  const setFormData = (v) => {
+  const setFormData = async (v) => {
     if (v.image) {
       setFieldsValue({
         image: [{ uid: buildUUID(), name: 'name', url: v.image } as FileItem],
@@ -86,6 +89,23 @@
     const { image, ...params } = v;
     console.log(image);
     setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
+    updateSchema({
+      field: 'category',
+      componentProps({ formModel }) {
+        return {
+          options: [
+            { label: '自定义品类', value: 2 },
+            { label: '标准品类', value: 1 },
+          ],
+          onChange() {
+            formModel.categoryId = null;
+            formModel.categoryName = undefined;
+          },
+          disabled: true,
+        };
+      },
+    });
+    cateGoryDisabled.value = true;
   };
   //获取数据
   async function getFormData() {

@@ -168,25 +168,26 @@
       params.deviceProfileId = props.record.id;
 
       if (unref(openModalMode) === OpenModelMode.CREATE) {
-        (await (unref(isSysadmin) || unref(isPlatformAdmin))) && props.record.ifShowClass
-          ? createModelCategory({
+        (unref(isSysadmin) || unref(isPlatformAdmin)) && props.record.ifShowClass
+          ? await createModelCategory({
               ...params,
               deviceProfileId: undefined,
               categoryId: props.record.id,
             })
-          : createModel(params);
+          : await createModel(params);
         createMessage.success('创建成功');
       } else {
         params.id = unref(openModalParams)?.record.id;
-        (await (unref(isSysadmin) || unref(isPlatformAdmin))) && props.record.ifShowClass
-          ? updateModelCategory({
+        (unref(isSysadmin) || unref(isPlatformAdmin)) && props.record.ifShowClass
+          ? await updateModelCategory({
               ...params,
               deviceProfileId: undefined,
               categoryId: props.record.id,
             })
-          : updateModel(params);
+          : await updateModel(params);
         createMessage.success('修改成功');
       }
+
       closeModal();
       emit('success');
     } catch (error) {