diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 63a66d7..cb290a8 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -71,6 +71,10 @@ const getSelectId = (list: any, id: any) => {
     for (let i in list) {
         if (list[i].id == id) {
             //查询到就返回该数组对象的value
+            console.log('21',list[i].propertyNames)
+            list[i].propertyNames.forEach((item:any) =>{
+            options.value.push({'label':item,'value':item})
+        })
             return [list[i].id]
         }
         if (list[i].children) {
@@ -187,12 +191,6 @@ const editRowInfo = (row: any) => {
 /* 查看按钮 */
 const previewRowInfo = (row: any) => {
     settleinTitle.value = '装备详情'
-        console.log('row',row)
-     if(row.devInfoProperties!=null){
-        row.devInfoProperties.forEach((item:any)=>{
-            propertyNamesTwo.value.push({'propertyName':item.propertyName,'propertyValue':item.propertyValue})
-        })
-    }
     getDetailData(row)
     disabledForm.value = true
     isEditDisabled.value = false
@@ -222,6 +220,7 @@ const deleteRowInfo = async (row: any) => {
 }
 //获取详情接口
 const getDetailData = async (row: any) => {
+    await getTypeTreeData()
     const { data: res }: any = await getDetailApi(row.maId)
     const {
         deviceName,
@@ -288,14 +287,13 @@ const getDetailData = async (row: any) => {
     })
     descriptionFormList.value[0].insurancePdfs = insurancePdf
     descriptionFormList.value[0].examinationPdfs = examinationPdf
+    options.value=[]
     addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
     if(res.devInfoProperties!=null){
         res.devInfoProperties.forEach((item:any)=>{
             propertyNamesTwo.value.push({'propertyName':item.propertyName,'propertyValue':item.propertyValue})
         })
     }
-    options.value=[]
-    console.log('addAndEditForm.deviceTypeList',addAndEditForm.deviceTypeList)
     // addAndEditForm.deviceTypeList[0].data.propertyNames.forEach((item:any) =>{
     //     options.value.push({'label':item,'value':item})
     //  })
@@ -409,7 +407,7 @@ const countDisabled = ref(false)
 //装备类目-change
 const dialogTypeCascader = ref()
 //装备类目-change
-const dialogTypeChange = () => {
+ const dialogTypeChange = async () => {
     const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
     // console.log(deviceTypeList)
     // equipmentDeploymentParams.value.unitName = deviceTypeList[0].data.unitName