Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/components/ConstructionDetails/index.vue

@@ -160,13 +160,13 @@
                   <template slot="prepend">自闭阀类型</template>
                 </el-input> -->
             </div>
-            <!-- <el-form-item label="照片" :prop="e.zEngiineeringPhotoBoList" class="obsImage"> -->
+            <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
               <ObsImageUpload
-                :class=" status == 'read-only' ? '' : obsImageUpload"
+                :class=" status == 'read-only' ? '' : 'obsImageUploads'"
                 ref="obsImageUpload"
-                :limit="9999"
+                :limit="11"
                 :fileType="['png', 'jpg', 'jpeg']"
-                @input="getUrl"
+                @input="getUrl(arguments,idx)"
                 :value="e.zEngiineeringPhotoBoList"
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
@@ -388,8 +388,8 @@ export default {
             this.specificationsList = res.data
         })
     },
-    getUrl(url,idx) {
-      this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
+    getUrl(_,idx) {
+      this.currentCollapses[idx].zEngiineeringPhotoBoList = [...arguments][0][0].map(e=>e.url) || [];
     },
   }
 }
@@ -418,10 +418,13 @@ export default {
   }
 }
 
-::v-deep .el-upload--picture-card {
-  display: none;
+::v-deep .el-upload-notShow{
+  .el-upload--picture-card {
+    display: none;
+  }
 }
 
+
 .ConstructionDetailsDialog {
   position: absolute;
 

src/components/EnginNodeInfo/index.vue

@@ -11,7 +11,7 @@
     <!-- 节点表单 -->
     <el-form ref="fangxianForm" :model="nodeInfo" :rules="nodeRules" label-width="200px">
       <h2 style="margin-left: 16%;font-weight: 800;">{{ name }}</h2>
-      <el-form-item label="施工时间" prop="constructTime" v-show="currentContain.includes('constructTime')">
+      <el-form-item label="施工时间" prop="constructTime" v-show="currentContain.includes('constructTime')" :style=" enginType == '顶管工程' ? 'margin-left: -43px' : '' ">
         <el-date-picker
           :disabled="formType"
           v-model="nodeInfo.constructTime"
@@ -49,7 +49,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" v-if="currentContain.includes('zEngiineeringPhotoBoList')">
+      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : '' " v-if="currentContain.includes('zEngiineeringPhotoBoList')">
         <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
       </el-form-item>
@@ -149,7 +149,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7" v-show="materialComponList.includes('corrosionLevel')">
+        <el-col :span="7" v-show="materialComponList.includes('corrosionLevel')" style="position: relative;left: -9%;">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.corrosionLevel'"
             label-width="150px"
@@ -190,15 +190,11 @@
                 :value="e.value"
               ></el-option>
             </el-select>
-          </el-form-item>
-        </el-col>
-        <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)">
-              删除
-            </el-button>
-          </el-form-item>
+          </el-form-item>   
         </el-col>
+        <el-button v-if="enginType != '民用工程' && zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
+            删除
+        </el-button>
       </el-row>
       <div style="width: 25%; float: right" v-if="enginType != '民用工程'">
         <!-- <el-button @click="addzEngineeringMaterialBo('nodeInfo',['materialQuality','specifications','number'])">新增用料信息</el-button> -->
@@ -363,6 +359,7 @@ export default {
     },
     // 获取材质规格
     getEnginSpecificationsList(e,idx){
+      this.zEngineeringMaterialBo[idx].specifications = null;
       getEnginSpecificationsList({materId:e.materialQuality}).then(res => {
         console.log('规格',res.data)
         this.specificationsList = res.data
@@ -393,5 +390,11 @@ export default {
       width: 113px !important;
     }
   }
+
+  .obsActiveImage{
+    .el-form{
+        left:-14% !important
+    }
+  }
 }
 </style>

src/views/zdsz/engineeringCivil/index.vue

@@ -157,7 +157,7 @@
             icon="el-icon-edit"
             @click="addNodeInfo(scope.row)"
             v-hasPermi="['zdsz:engineeringCivil:add']"
-          >填写节点信息
+          >填写施工信息
           </el-button>
           <el-button
             size="mini"
@@ -181,7 +181,7 @@
             icon="el-icon-time"
             @click="viewSource(scope.row)"
             v-hasPermi="['zdsz:engineeringCivil:query']"
-          >历史用料
+          >历史施工
           </el-button>
           <el-button
             size="mini"
@@ -359,7 +359,7 @@
         </el-row>
         <el-row>
           <el-col :span="24" v-if="title!=='修改民用工程'">
-            <el-form-item label="节点">
+            <el-form-item label="环节">
               <el-checkbox-group v-model="currentCheckList">
                 <el-checkbox
                   :label="item.dictValue"
@@ -440,7 +440,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="节点" label-width="68px">
+        <el-form-item label="环节" label-width="68px">
           <el-select
             v-model="checkingForm.type"
             placeholder="请选择工程分类"
@@ -993,7 +993,7 @@ export default {
         }
       })
     },
-    // 填写节点信息
+    // 填写施工信息
     updateNodeOption(zEngineeringInfoBoList){
       delete this.updateParams.zEngineeringNodeBoList
       this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList