shaun-sheep пре 5 година
родитељ
комит
ad4df21e00
2 измењених фајлова са 4 додато и 3 уклоњено
  1. 1 1
      src/components/dialogs/list/batchDialog.vue
  2. 3 2
      src/views/relation/overview/index.vue

+ 1 - 1
src/components/dialogs/list/batchDialog.vue

@@ -399,7 +399,7 @@
                     InsuranceDoc: insuranceFile.InsuranceFile.length ? {
                         InsuranceFile: insuranceFile.InsuranceFile.length ? insuranceFile.InsuranceFile : undefined
                     } : undefined,
-                    PhotoDoc: archive.Archive.length || drawing.Drawing.length || nameplate.Nameplate.length ? {
+                    PhotoDoc: archive.Archive.length || drawing.Drawing.length || nameplate.Nameplate.length || pic.Pic.length ? {
                         Archive: archive.Archive.length ? archive.Archive : undefined,
                         Drawing: drawing.Drawing.length ? drawing.Drawing : undefined,
                         Nameplate: nameplate.Nameplate.length ? nameplate.Nameplate : undefined,

+ 3 - 2
src/views/relation/overview/index.vue

@@ -91,7 +91,6 @@
                     //     ]
                     // }
                 ],
-                total: []
             }
         },
         created() {
@@ -115,7 +114,7 @@
                 this.countNumber = resCount.Content
             })
             api.graphic(data, res => {
-                res.Content.forEach(item => {
+                this.content = res.Content.map(item => {
                     // 二级从属关系
                     (item.ChildGraphicTypeList != null) && item.ChildGraphicTypeList.forEach(child => {
 
@@ -132,8 +131,10 @@
                             }
                         })
                     })
+                    return item
                 })
                 this.content = res.Content
+                console.log(this.content)
                 // this.transform(this.content, this.countNumber)
 
             })