From 8643c87a7189ea3bc5504db42c60fadec4b36f10 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 10 Dec 2024 18:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/goodsManagement/index.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 4cb61cd..63a66d7 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -187,12 +187,13 @@ const editRowInfo = (row: any) => {
 /* 查看按钮 */
 const previewRowInfo = (row: any) => {
     settleinTitle.value = '装备详情'
-    getDetailData(row)
+        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
     isViewForm.value = true
@@ -242,6 +243,7 @@ const getDetailData = async (row: any) => {
         detailsFileList,
         insurancePdf,
         examinationPdf,
+        devInfoProperties,
     } = res
 
     Object.assign(addAndEditForm, {
@@ -263,7 +265,9 @@ const getDetailData = async (row: any) => {
         detailsFileList,
         insurancePdf,
         examinationPdf,
+        devInfoProperties,
     })
+
     if (settleinTitle.value == '装备编辑') {
         Object.assign(addAndEditForm, {
             maId: row.maId,
@@ -285,6 +289,16 @@ const getDetailData = async (row: any) => {
     descriptionFormList.value[0].insurancePdfs = insurancePdf
     descriptionFormList.value[0].examinationPdfs = examinationPdf
     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})
+    //  })
     dialogFormVisibleSettlein.value = true
 
     console.log(res, '详情接口')
@@ -424,8 +438,6 @@ const dialogTypeChange = () => {
                 options.value.push({'label':item,'value':item})
         })
         console.log(propertyNames.value)
-    //    propertyNames.value = deviceTypeList[0].data.propertyNames
-    //    console.log(propertyNames.value)
     }
     // propertyNames.value = deviceTypeList[0].data.propertyNames
     isDisabled.value = true
@@ -676,6 +688,7 @@ const closeDialogBtn = () => {
 const handleClose = (done: () => void) => {
     // ruleFormRef.value.resetFields()
     done()
+    propertyNamesTwo.value = []
     dialogFormVisibleSettlein.value = false
 }