Commit b06803d1d77575db4b74dae2719f39a786e87e97

Authored by loveumiko
1 parent 4a17f35a

fix: 修复编辑产品品类成功后,没有提示框和产品品类删除报错

@@ -6,11 +6,13 @@ @@ -6,11 +6,13 @@
6 import { useForm, BasicForm } from '/@/components/Form'; 6 import { useForm, BasicForm } from '/@/components/Form';
7 7
8 import { deviceProfileCategory } from '/@/api/device/classModal'; 8 import { deviceProfileCategory } from '/@/api/device/classModal';
  9 + import { useMessage } from '/@/hooks/web/useMessage';
9 10
10 const emit = defineEmits(['handleReload', 'register']); 11 const emit = defineEmits(['handleReload', 'register']);
11 12
12 const isUpdate = ref<Boolean>(false); 13 const isUpdate = ref<Boolean>(false);
13 const getTitle = computed(() => (!unref(isUpdate) ? '新增分类' : '编辑分类')); 14 const getTitle = computed(() => (!unref(isUpdate) ? '新增分类' : '编辑分类'));
  15 + const { createMessage } = useMessage();
14 16
15 const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({ 17 const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
16 labelWidth: 140, 18 labelWidth: 140,
@@ -43,8 +45,8 @@ @@ -43,8 +45,8 @@
43 if (unref(isUpdate)) { 45 if (unref(isUpdate)) {
44 values = { ...values, id: unref(recordInfo).id }; 46 values = { ...values, id: unref(recordInfo).id };
45 } 47 }
46 - console.log(unref(isUpdate), values, 'values');  
47 await deviceProfileCategory(values); 48 await deviceProfileCategory(values);
  49 + createMessage.success('操作成功');
48 emit('handleReload'); 50 emit('handleReload');
49 handleCancel(); 51 handleCancel();
50 }; 52 };
1 import classModal from './classModal.vue'; 1 import classModal from './classModal.vue';
2 -import physicalModel from './physicalModel.vue';  
3 2
4 -export { classModal, physicalModel }; 3 +export { classModal };
1 -<script setup lang="ts">  
2 - import { ref } from 'vue';  
3 - import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';  
4 - import PhysicalModelManagementStep from '/@/views/device/profiles/step/PhysicalModelManagementStep.vue';  
5 -  
6 - defineEmits(['register']);  
7 - const record = ref<any>({});  
8 - const [register, {}] = useDrawerInner(async (data: { record: any }) => {  
9 - record.value = { ...data.record, ifShowClass: true };  
10 - });  
11 -</script>  
12 -<template>  
13 - <BasicDrawer v-bind="$attrs" title="物模型" @register="register" width="60%" destroy-on-close>  
14 - <PhysicalModelManagementStep :record="record" />  
15 - </BasicDrawer>  
16 -</template>  
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 import { useMessage } from '/@/hooks/web/useMessage'; 7 import { useMessage } from '/@/hooks/web/useMessage';
8 import { Authority } from '/@/components/Authority'; 8 import { Authority } from '/@/components/Authority';
9 import { useModal } from '/@/components/Modal'; 9 import { useModal } from '/@/components/Modal';
10 - import { classModal, physicalModel } from './components/index'; 10 + import { classModal } from './components/index';
11 import { useDrawer } from '/@/components/Drawer'; 11 import { useDrawer } from '/@/components/Drawer';
12 import { USER_INFO_KEY } from '/@/enums/cacheEnum'; 12 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
13 import { getAuthCache } from '/@/utils/auth'; 13 import { getAuthCache } from '/@/utils/auth';
@@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
17 deleteDeviceClass, 17 deleteDeviceClass,
18 deviceProfileCategory, 18 deviceProfileCategory,
19 } from '/@/api/device/classModal'; 19 } from '/@/api/device/classModal';
  20 +
  21 + import { BasicDrawer } from '/@/components/Drawer';
  22 + import PhysicalModelManagementStep from '/@/views/device/profiles/step/PhysicalModelManagementStep.vue';
20 const [ 23 const [
21 registerTable, 24 registerTable,
22 { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection }, 25 { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
@@ -82,8 +85,13 @@ @@ -82,8 +85,13 @@
82 }; 85 };
83 86
84 // 详情 87 // 详情
  88 + const registerDetailRecord = ref<any>({});
85 const handleDetail = (record?: any) => { 89 const handleDetail = (record?: any) => {
86 - openDrawer(true, { record }); 90 + openDrawer(true);
  91 + registerDetailRecord.value = {
  92 + ...record,
  93 + ifShowClass: true,
  94 + };
87 }; 95 };
88 96
89 // 状态->编辑 97 // 状态->编辑
@@ -177,6 +185,9 @@ @@ -177,6 +185,9 @@
177 </template> 185 </template>
178 </BasicTable> 186 </BasicTable>
179 <classModal @register="registerModal" @handleReload="handleReload" /> 187 <classModal @register="registerModal" @handleReload="handleReload" />
180 - <physicalModel @register="registerDetailDrawer" /> 188 + <!-- <physicalModel @register="registerDetailDrawer" :record /> -->
  189 + <BasicDrawer title="物模型" @register="registerDetailDrawer" width="60%" destroy-on-close>
  190 + <PhysicalModelManagementStep :record="registerDetailRecord" />
  191 + </BasicDrawer>
181 </div> 192 </div>
182 </template> 193 </template>