bug Fix

src/components/EnginNodeInfo/index.vue

@@ -117,6 +117,19 @@
                     </div>
                     </el-form-item>
                 </el-col>
+                <el-col :span="7" v-show="materialComponList.includes('remark')">
+                    <el-form-item
+                    :prop="'zEngineeringMaterialBo.' + index + '.remark'"
+                    label="描述"
+                    label-width="50px"
+                    class="material_desc"
+                    >
+                    <!--                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"-->
+                    <div class="block" style="display: inline-block; margin-right: 20px;">
+                        <el-input v-model="item.remark" placeholder="请填写描述" style="width: 200px;" maxlength="255" type="textarea"/>
+                    </div>
+                    </el-form-item>
+                </el-col>
                 <el-col :span="7" v-show="materialComponList.includes('brand')">
                     <el-form-item
                     :prop="'zEngineeringMaterialBo.' + index + '.brand'"
@@ -136,7 +149,7 @@
                     </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="7" v-show="materialComponList.includes('corrosionLevel')" style="display: flex;position: relative;left: -8.7%;">
+                <el-col :span="7" v-show="materialComponList.includes('corrosionLevel')">
                     <el-form-item
                     :prop="'zEngineeringMaterialBo.' + index + '.corrosionLevel'"
                     label-width="150px"
@@ -179,7 +192,7 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="3" v-if="enginType != '民用工程'">
+                <el-col :span="3" v-if="enginType != '民用工程'" style="position: absolute;right: 0;">
                     <el-form-item style="margin-left: -197px;">
                     <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
                         删除
@@ -325,11 +338,12 @@ export default {
         },
         addMaterial(){
             let materialBo = {}
+            console.log(this.materialComponList)
             this.materialComponList.forEach(e => {
                 materialBo[e] = null
             })
             this.zEngineeringMaterialBo.push(materialBo)
-            console.log('节点用料参数对象',this.zEngineeringMaterialBo)
+            // console.log('节点用料参数对象',this.zEngineeringMaterialBo)
         },
         addzEngineeringMaterialBo(option,params){
             let material = {}
@@ -359,6 +373,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+::v-deep .material_desc{
+    .el-form-item__content{
+        margin-left: 50px !important;
+    }
+}
 ::v-deep .el-form{
     position: relative;
     left: -10%;

src/components/EngineePipe/index.vue

@@ -272,10 +272,10 @@ export default {
               'materialQuality',                       // 材质
               'specifications',                        // 规格
               'number',                                // 数量
+              'remark',                                // 描述
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 描述
           ]
         },
         {
@@ -285,10 +285,10 @@ export default {
               'materialQuality',                       // 材质
               'specifications',                        // 规格
               'number',                                // 数量
+              'remark',                                // 描述
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 描述
           ]
         },
         {
@@ -298,10 +298,10 @@ export default {
               'materialQuality',                       // 材质
               'specifications',                        // 规格
               'number',                                // 数量
+              'remark',                                // 描述
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 描述
           ]
         },
         {
@@ -311,10 +311,10 @@ export default {
               'materialQuality',                       // 材质
               'specifications',                        // 规格
               'number',                                // 数量
+              'remark',                                // 描述
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 描述
           ]
         }
         
@@ -418,6 +418,8 @@ export default {
         nodeCollection.push(nodeItem)
       })
       this.queryParams.zEngineeringNodeBoList = nodeCollection
+      this.queryParams.zEngineeringNodeBoList[0].zEngineeringInfoBo.constructTime = this.queryParams.zEngineeringNodeBoList[0].constructTime
+      delete this.queryParams.zEngineeringNodeBoList[0].constructTime
       if (this.enginNodeStatus == '修改') {
         this.queryParams.files = this.$refs.obsFileUpload.fileList;
         if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){

src/views/zdsz/enginee/material/progres_visual/index.vue

@@ -285,6 +285,8 @@ export default {
             roomsInfo:[],
             updateParams:{},
             currentRoomId:null,
+            currentEnginType:null,
+            currentEnginClassification:'indoor_engin',
         }
     },
     methods:{
@@ -294,6 +296,7 @@ export default {
             // 拼接字典
             this.dict.type[e.enginCycle].forEach(v => {
                 if(v.label.includes('室内')){
+                    this.currentEnginType = e.enginCycle
                     dictValue = e.enginCycle + '_' + v.value
                 }
             })
@@ -315,6 +318,8 @@ export default {
             let params = {
                 type:e,
                 houseId:this.currentRoomId,
+                enginClassification:this.currentEnginClassification,
+                enginType:this.currentEnginType
             }
             viewQueryProcessSource(params).then(res => {
                 console.log('______',res)
@@ -332,7 +337,7 @@ export default {
         searchCompletionInfo(){
             getObtainRoomcCompletionInformationList(this.searchParam).then(res => {
                 let info = []
-                info = res.data
+                info = res.data.concat(res.data).concat(res.data).concat(res.data)
                 info.forEach(e => {
                     e.roomStatusVoList = e.roomStatusVoList.reverse()
                 })