Merge branch 'hongchao-dev'

src/views/user/goodsManagement/index.vue

@@ -72,9 +72,11 @@ const getSelectId = (list: any, id: any) => {
         if (list[i].id == id) {
             //查询到就返回该数组对象的value
             console.log('21',list[i].propertyNames)
-            list[i].propertyNames.forEach((item:any) =>{
+            if( list[i].propertyNames!=null){
+             list[i].propertyNames.forEach((item:any) =>{
             options.value.push({'label':item,'value':item})
         })
+            }
             return [list[i].id]
         }
         if (list[i].children) {
@@ -408,6 +410,7 @@ const countDisabled = ref(false)
 const dialogTypeCascader = ref()
 //装备类目-change
  const dialogTypeChange = async () => {
+    options.value=[]
     const deviceTypeList = dialogTypeCascader.value.getCheckedNodes()
     // console.log(deviceTypeList)
     // equipmentDeploymentParams.value.unitName = deviceTypeList[0].data.unitName