wangtong 1 éve
szülő
commit
f81b5607e0

+ 10 - 9
src/components/ConstructionDetails/index.vue

@@ -497,6 +497,8 @@ export default {
       materialQualityList:[],                     // 材质
       specificationsList:[],                      // 规格
       materialComponList:[],
+      enginType:null,
+      enginClassification:null,
       nodeInfo:{
           backfillTime:'',                       // 回填时间
           constructTime:'',
@@ -637,11 +639,10 @@ export default {
       console.log('节点',e)
       this.node=e.name
       this.nodesource=e
-      console.log('data',this.zEngineeringNodeBo)
-      let data = {enginSort:this.zEngineeringNodeBo.enginType}
+      let data = {enginSort:this.enginType}
       console.log(this.node)
       data.enginStep = this.node
-      data.enginNode = this.zEngineeringNodeBo.enginClassification
+      data.enginNode = this.enginClassification
       if(this.node == '阀管'){
         data.nameType = "自闭阀厂家";
         getEnginMaterialQualityList(data).then(res => {
@@ -690,11 +691,11 @@ export default {
       });
     },
     // 查看历史
-    open(dicts, type = null,currentStatus = null,kind = null,title= null,zEngineeringNodeBo) {
-      console.log(zEngineeringNodeBo)
-      let data = {enginSort:zEngineeringNodeBo.enginType}
-
-      data.enginNode = zEngineeringNodeBo.enginClassification
+    open(dicts, type = null,currentStatus = null,kind = null,title= null,enginClassification,enginType) {
+      this.enginType=enginType
+      this.enginClassification=enginClassification
+      let data = {enginSort:enginType}
+      data.enginNode = enginClassification
       getEnginMaterialQualityList(data).then(res => {
         this.materialQualityList = res.data
       })
@@ -711,7 +712,7 @@ export default {
         })
       }
       //data.enginStep = this.node
-      data.enginNode = zEngineeringNodeBo.enginClassification
+      data.enginNode = enginClassification
       getEnginMaterialQualityList(data).then(res => {
         this.materialQualityList = res.data
       })

+ 3 - 1
src/views/zdsz/enginee/material/progres_visual/index.vue

@@ -328,6 +328,7 @@ export default {
       currentRoomId: null,
       currentEnginType: null,
       currentEnginClassification: 'indoor_engin',
+      zEngineeringNodeBo:null,
       searchRules: {
         district: [
           {required: true, message: "行政区不能为空", trigger: ['change']}
@@ -376,7 +377,7 @@ export default {
         }
         console.log(dict)
         setTimeout(() => {
-          this.$refs.ConstructionDetails.open(dict)
+          this.$refs.ConstructionDetails.open(dict,this.currentEnginType)
         })
       })
       this.status = 'read-only'
@@ -393,6 +394,7 @@ export default {
         try {
           this.updateParams = res.data
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
+          this.zEngineeringNodeBo=res.data.zEngineeringNodeBo
         } catch (error) {
           this.currentCollapses = [];
         }

+ 2 - 2
src/views/zdsz/engineeringCivil/index.vue

@@ -1519,7 +1519,7 @@ export default {
           })
         }
         this.zEngineeringNodeBo=e
-        this.$refs.ConstructionDetails.open(dict, null, null, null, title,this.zEngineeringNodeBo)
+        this.$refs.ConstructionDetails.open(dict, null, null, null, title,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
       })
     },
     viewNodeSource(e = null) {
@@ -1561,7 +1561,7 @@ export default {
         }
         this.zEngineeringNodeBo = e
         console.log(this.zEngineeringNodeBo)
-        this.$refs.ConstructionDetails.open(dict, _, type, null, title,this.zEngineeringNodeBo)
+        this.$refs.ConstructionDetails.open(dict, _, type, null, title,this.zEngineeringNodeBo.enginClassification,this.enginType)
         this.status = 'read-only'
       })
     },