Przeglądaj źródła

'1,生产厂商/产品型号。2,没有勾选的不上传字段。3,多选时不上传四大长四大厂商id

shaun-sheep 5 lat temu
rodzic
commit
caec995a69
1 zmienionych plików z 35 dodań i 40 usunięć
  1. 35 40
      src/components/dialogs/list/batchDialog.vue

+ 35 - 40
src/components/dialogs/list/batchDialog.vue

@@ -351,71 +351,66 @@
                 })
                 })
                 let Id = {}
                 let Id = {}
                 let single = {
                 let single = {
-                    EquipManufactor: {
-                        // Manufacturer: '', //生产商
-                        // Brand: '',//品牌
-                        // Specification: '',//型号
-                    },
-                    SupplyPurchase: { //供应商
-                        // SupplierWeb: '',
-                        // Supplier: '',
-                        // PurchasePrice: ''
-                    },
-                    OperationMainte: { //维修商
-                        // Maintainer: '',
-                    },
-                    InsuranceDoc: {
-                        // Insurer: '',
-                        // InsurerWeb: '',
-                        InsuranceFile: this.information.insuranceFile.InsuranceFile ? this.information.insuranceFile.InsuranceFile : null
-                    }
                 };
                 };
                 // this.deviceList 单选数组,取到需要数据
                 // this.deviceList 单选数组,取到需要数据
                 // 过滤数组,取对象
                 // 过滤数组,取对象
                 this.deviceList.filter(item => item.num === 2).forEach(i => { //型号
                 this.deviceList.filter(item => item.num === 2).forEach(i => { //型号
                     let {venderName, brandName, Specification, venderId, brandId, specificationId} = i.info
                     let {venderName, brandName, Specification, venderId, brandId, specificationId} = i.info
-                    single.EquipManufactor.Manufacturer = venderName
+                    single.EquipManufactor = {
+                        Manufacturer: venderName,
+                        Brand: brandName,
+                        Specification: Specification
+                    }
                     Id.DPManufacturerID = venderId
                     Id.DPManufacturerID = venderId
-                    single.EquipManufactor.Brand = brandName
                     Id.DPBrandID = brandId
                     Id.DPBrandID = brandId
-                    single.EquipManufactor.Specification = Specification
                     Id.DPSpecificationID = specificationId
                     Id.DPSpecificationID = specificationId
                 })
                 })
                 this.deviceList.filter(item => item.num === 8).forEach(i => {  //供应商8
                 this.deviceList.filter(item => item.num === 8).forEach(i => {  //供应商8
                     let {website, name, venderId} = i.info
                     let {website, name, venderId} = i.info
-                    single.SupplyPurchase.SupplierWeb = website
-                    single.SupplyPurchase.Supplier = name
+                    single.SupplyPurchase = {
+                        SupplierWeb: website,
+                        Supplier: name,
+
+                    }
                     Id.DPSupplierID = venderId
                     Id.DPSupplierID = venderId
                 })
                 })
                 this.deviceList.filter(item => item.num === 35).forEach(i => {  //维修商
                 this.deviceList.filter(item => item.num === 35).forEach(i => {  //维修商
                     let {name, venderId} = i.info
                     let {name, venderId} = i.info
-                    single.OperationMainte.Maintainer = name
+                    single.OperationMainte = {
+                        Maintainer: name
+                    }
                     Id.DPMaintainerID = venderId
                     Id.DPMaintainerID = venderId
                 })
                 })
                 this.deviceList.filter(item => item.num === 42).forEach(i => {  //保险
                 this.deviceList.filter(item => item.num === 42).forEach(i => {  //保险
                     let {website, name, venderId} = i.info
                     let {website, name, venderId} = i.info
-                    single.InsuranceDoc.Insurer = name
-                    single.InsuranceDoc.InsurerWeb = website
+                    single.InsuranceDoc = {
+                        Insurer: name,
+                        InsurerWeb: website,
+                        InsuranceFile: this.information.insuranceFile.InsuranceFile.length ? this.information.insuranceFile.InsuranceFile : undefined
+
+                    }
+
                     Id.DPInsurerID = venderId
                     Id.DPInsurerID = venderId
                 })
                 })
                 // this.information 多选信息
                 // this.information 多选信息
                 let {archive, checkReport, drawing, installDrawing, installPic, insuranceFile, nameplate, pic} = this.information
                 let {archive, checkReport, drawing, installDrawing, installPic, insuranceFile, nameplate, pic} = this.information
                 let multiple = {
                 let multiple = {
-                    InsuranceDoc: {
-                        InsuranceFile: insuranceFile.InsuranceFile ? insuranceFile.InsuranceFile : null
-                    },
-                    PhotoDoc: {
-                        Archive: archive.Archive ? archive.Archive : null,
-                        Drawing: drawing.Drawing ? drawing.Drawing : null,
-                        Nameplate: nameplate.Nameplate ? nameplate.Nameplate : null,
-                        Pic: pic.Pic ? pic.Pic : null
-                    },
-                    Siteinstall: {
-                        InstallPic: installPic.InstallPic ? installPic.InstallPic : null,
-                        InstallDrawing: installDrawing.InstallDrawing ? installDrawing.InstallDrawing : null,
-                        CheckReport: checkReport.CheckReport ? checkReport.CheckReport : null
-                    }
+                    InsuranceDoc: insuranceFile.InsuranceFile.length ? {
+                        InsuranceFile: insuranceFile.InsuranceFile.length ? insuranceFile.InsuranceFile : undefined
+                    } : undefined,
+                    PhotoDoc: archive.Archive.length || drawing.Drawing.length || nameplate.Nameplate.length ? {
+                        Archive: archive.Archive.length ? archive.Archive : undefined,
+                        Drawing: drawing.Drawing.length ? drawing.Drawing : undefined,
+                        Nameplate: nameplate.Nameplate.length ? nameplate.Nameplate : undefined,
+                        Pic: pic.Pic.length ? pic.Pic : undefined
+                    } : undefined,
+                    Siteinstall: installPic.InstallPic.length || installDrawing.InstallDrawing.length || checkReport.CheckReport.length ? {
+                        InstallPic: installPic.InstallPic.length ? installPic.InstallPic : undefined,
+                        InstallDrawing: installDrawing.InstallDrawing.length ? installDrawing.InstallDrawing : undefined,
+                        CheckReport: checkReport.CheckReport.length ? checkReport.CheckReport : undefined
+                    } : undefined
                 }
                 }
+                console.log(multiple, 'multilp')
                 let LedgerParam = {}
                 let LedgerParam = {}
                 if (this.radio === 1) { //组装数据,根据是覆盖该是增量,1是增量
                 if (this.radio === 1) { //组装数据,根据是覆盖该是增量,1是增量
                     //    1:单选数据
                     //    1:单选数据