Merge branch 'dev-sy'

src/views/user/goodsManagement/index.vue

@@ -132,6 +132,16 @@ const equipmentDeployment = () => {
     isViewForm.value = false
     isEditForm.value = false
     Object.assign(addAndEditForm, addAndEditFormTemp)
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdf: [],
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
     disabledForm.value = false
     isEditDisabled.value = true
     equipmentDeploymentParams.value = {
@@ -176,6 +186,7 @@ const previewRowInfo = (row: any) => {
     disabledForm.value = true
     isEditDisabled.value = false
     isViewForm.value = true
+    isEditForm.value = false
 }
 // 删除按钮
 const deleteRowInfo = async (row: any) => {
@@ -250,6 +261,17 @@ const getDetailData = async (row: any) => {
 
         console.log(row.maId, '****')
     }
+
+    descriptionFormList.value = []
+    descriptionFormList.value.push({
+        newId: Date.now(),
+        insurancePdf: [],
+        insurancePdfs: [],
+        insuranceATempPdf: [],
+        examinationPdf: [],
+        examinationPdfs: [],
+        examinationTempPdf: [],
+    })
     descriptionFormList.value[0].insurancePdfs = insurancePdf
     descriptionFormList.value[0].examinationPdfs = examinationPdf
     addAndEditForm.deviceTypeList = getSelectId(deviceTypeTree.value, addAndEditForm.typeId)
@@ -558,6 +580,8 @@ const submitFun = (type: any) => {
                 e.examinationPdfs = [...e.examinationPdfs, ...e.examinationTempPdf]
                 addAndEditForm.insurancePdfs[index] = e.insurancePdfs
                 addAndEditForm.examinationPdfs[index] = e.examinationPdfs
+
+                console.log(e.insurancePdfs, ' e.insurancePdfs---')
             })
 
             for (let index = 0; index < descriptionFormList.value.length; index++) {
@@ -1440,7 +1464,7 @@ const onDialogClose = () => {
                 </el-col>
             </el-row>
             <TitleTip :titleText="`装备证书`" />
-            <el-row :gutter="20" v-if="!disabledForm">
+            <el-row :gutter="20" v-if="!isEditForm && !isViewForm">
                 <el-col :span="24">
                     <el-button class="primary-lease" type="primary" @click="onAddDescription">
                         添加装备证书