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

# Conflicts:
#	src/views/zdsz/engineeringGY/index.vue

src/components/ConstructionDetails/indexGY.vue

@@ -76,6 +76,134 @@
                 </el-collapse-item>
               </el-collapse>
             </el-checkbox-group>
+            <el-checkbox-group v-if="enginClassification=='架空管线' || enginClassification=='每日施工日志'" v-model="checkList">
+              <el-collapse
+                class="rmOldPie"
+                v-for="(e,idx) in currentCollapses"
+                :key="idx"
+              >
+                <el-collapse-item :name="idx">
+                  <template slot="title">
+                    <div style="display: flex;width: 100%;height: 100%;">
+                      <el-checkbox :label="e.id" @change="handleCheckedCitiesChange">
+                        <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateTime }}</h2>
+                      </el-checkbox>
+                      <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">  {{e.state=='0'?"该施工信息审核未通过":e.state=='1'?"该施工信息审核通过":""}}</h2>
+                    </div>
+                  </template>
+                  <div class="personInfo">
+                    <span>施工人：{{ userNames[idx].nickName }}</span>
+                    <span>施工人电话：{{ userNames[idx].phonenumber }}</span>
+                  </div>
+                  <hr>
+                  <el-form :model="e">
+                    <el-form-item
+                      :prop="e.remark"
+                      :class="'labelWidth'"
+                      label="施工内容"
+                      label-width="95px"
+                    >
+                      <div class="block" style="display: inline-block; margin-right: 20px;">
+                        <el-input v-model="e.remark" placeholder="请输入施工内容" style="width: 100%" maxlength="100"
+                                  type="textarea" :readonly="['review','read-only'].includes(status)"></el-input>
+                      </div>
+                    </el-form-item>
+                  </el-form>
+                  <div style="display: flex;width: 100%;height: 100%;">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getUrl(arguments,idx)"
+                      :value="e.zEngiineeringPhotoBoList"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <!--  用料明细 -->
+                  <div v-if="['除锈刷油','全貌照片'].includes(activeNames)"
+                       v-for="(i,index) in e.zEngineeringMaterialBo || [] "
+                       :key="index"
+                  >
+                    <el-form :model="nodeInfo" class="nodeForm materialForm">
+                      <el-form-item
+                        :prop="i.materialQuality"
+                        :class="'labelWidth'"
+                        :label="'材质'"
+                        label-width="95px"
+                      >
+                        <el-select v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%"
+                                   @change="getEnginSpecificationsList(i, index,idx)" :disabled="['review','read-only'].includes(status)">
+                          <el-option
+                            v-for="e in materialQualityList"
+                            :key="e.id"
+                            :label="e.name"
+                            :value="e.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+                      <el-form-item
+                        :prop="i.specifications"
+                        :class="'labelWidth'"
+                        label="规格"
+                        label-width="95px"
+
+                      >
+                        <el-select v-model="i.specifications" placeholder="请选择规格" style="width: 100%"
+                                   :disabled="['review','read-only'].includes(status)" @change="$forceUpdate">
+                          <el-option
+                            v-for="e in corrosionLevelListAll.filter(o => o.materId == i.materialQuality)"
+                            :key="e.id"
+                            :label="e.name"
+                            :value="e.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+                      <!--                    <el-form-item-->
+                      <!--                      :prop="i.remark + ''"-->
+                      <!--                      :class="'labelWidth'"-->
+                      <!--                      label="施工内容"-->
+                      <!--                      label-width="95px"-->
+                      <!--                    >-->
+                      <!--                      <div class="block" style="display: inline-block; margin-right: 20px;">-->
+                      <!--                        <el-input v-model="i.remark" placeholder="请输入施工内容" style="width: 100%" maxlength="100"-->
+                      <!--                                  type="textarea" :disabled="status == 'read-only'"></el-input>-->
+                      <!--                      </div>-->
+                      <!--                    </el-form-item>-->
+
+                      <el-form-item
+                        :prop="i.number + ''"
+                        :class="'labelWidth'"
+                        label="米数"
+                        label-width="95px"
+                      >
+                        <div class="block" style="display: inline-block; margin-right: 20px;">
+                          <el-input v-model="i.number" placeholder="请输入米数" style="width: 100%"
+                                    oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                                    max="999999999" :disabled="['review','read-only'].includes(status)"></el-input>
+                        </div>
+                      </el-form-item>
+                      <!--                    <el-form-item-->
+                      <!--                      :prop="i.remark + ''"-->
+                      <!--                      label="描述"-->
+                      <!--                    >-->
+                      <!--                      <div class="block" style="display: inline-block; margin-right: 20px;">-->
+                      <!--                        <el-input v-model="i.remark" placeholder="请输入描述" style="width: 100%" maxlength="100"-->
+                      <!--                                  :disabled="status == 'read-only'"></el-input>-->
+                      <!--                      </div>-->
+                      <!--                    </el-form-item>-->
+                    </el-form>
+                  </div>
+                  <div style="display: flex;  justify-content: flex-end; width: 100%;height: 100%;"
+                       v-if="status == 'put'">
+                    <el-button plain type="danger" @click=" handleDelete(e)"
+                               v-hasPermi="['zdsz:engineeringCivilNode:remove']" style="width: 94px;">删除
+                    </el-button>
+                  </div>
+                </el-collapse-item>
+              </el-collapse>
+            </el-checkbox-group>
             <el-checkbox-group v-if="enginClassification=='室内管线'" v-model="checkList">
               <el-collapse
                 class="rmOldPie"
@@ -219,7 +347,7 @@
                   <hr>
                   <el-form :model="e">
                     <el-form-item
-                      v-if="activeNames=='隐蔽工程'"
+                      v-if="activeNames=='隐蔽工程' || activeNames=='管道施工记录'|| activeNames=='阀井'"
                       :prop="e.remark"
                       :class="'labelWidth'"
                       label="施工内容"
@@ -232,7 +360,7 @@
                     </el-form-item>
                   </el-form>
                   <!--  用料明细 -->
-                  <div v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(activeNames)"
+                  <div v-if="['焊接、防腐','架空管线','下管','沟下连头','顶管材料米数'].includes(activeNames)"
                        v-for="(i,index) in e.zEngineeringMaterialBo || [] "
                        :key="index"
                   >
@@ -261,7 +389,7 @@
 
                       >
                         <el-select v-model="i.specifications" placeholder="请选择规格" style="width: 100%"
-                                   :disabled="['review','read-only'].includes(status)">
+                                   :disabled="['review','read-only'].includes(status)" @change="$forceUpdate">
                           <el-option
                             v-for="e in corrosionLevelListAll.filter(o => o.materId == i.materialQuality)"
                             :key="e.id"
@@ -305,7 +433,7 @@
                       <!--                    </el-form-item>-->
                     </el-form>
                   </div>
-                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames != '回填、撤场'">
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames != '回填、撤场' && activeNames != '顶管材料米数' && activeNames != '调压柜'&& activeNames != '阀井'">
                     <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">图片</h3>
                     <ObsImageUpload
                       :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
@@ -317,6 +445,114 @@
                       :disabled="['review','read-only'].includes(status)"
                     ></ObsImageUpload>
                   </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '调压柜'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">铭牌</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getboxBrandUrl(arguments,idx)"
+                      :value="e.boxBrand"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '调压柜'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">底腿连接</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getBottomLegUrl(arguments,idx)"
+                      :value="e.bottomLeg"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '调压柜'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">石粉回填</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getstonePowderUrl(arguments,idx)"
+                      :value="e.stonePowder"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '调压柜'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">防雷接地</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getLightningUrl(arguments,idx)"
+                      :value="e.lightning"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '调压柜'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">地面硬化</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getGroundHardeningUrl(arguments,idx)"
+                      :value="e.groundHardening"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '阀井'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">套管</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getCannulaUrl(arguments,idx)"
+                      :value="e.cannula"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '阀井'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">内壁抹灰</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getWallPlasterUrl(arguments,idx)"
+                      :value="e.wallPlaster"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '阀井'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">防护网</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getProtectiveNetUrl(arguments,idx)"
+                      :value="e.protectiveNet"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
+                  <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '阀井'">
+                    <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">八角</h3>
+                    <ObsImageUpload
+                      :class=" (status == 'read-only' || status == 'review' )? 'obsImageUploads' : '' "
+                      ref="obsImageUpload"
+                      :limit="11"
+                      :fileType="['png', 'jpg', 'jpeg']"
+                      @input="getStarAniseUrl(arguments,idx)"
+                      :value="e.starAnise"
+                      :disabled="['review','read-only'].includes(status)"
+                    ></ObsImageUpload>
+                  </div>
                   <div style="display: flex;width: 100%;height: 100%;" v-if="activeNames == '回填、撤场'">
                     <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">回填前</h3>
                     <ObsImageUpload
@@ -703,6 +939,37 @@ export default {
         this.specificationsList = res.data
       })
     },
+    getboxBrandUrl(_,idx) {
+      this.currentCollapses[idx].boxBrand = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getBottomLegUrl(_,idx) {
+      this.currentCollapses[idx].bottomLeg = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getbeforeBottomUrl(_,idx) {
+      this.currentCollapses[idx].beforeBottom = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getstonePowderUrl(_,idx) {
+      this.currentCollapses[idx].stonePowder = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getCannulaUrl(_,idx) {
+      console.log("this.currentCollapses",this.currentCollapses)
+      this.currentCollapses[idx].cannula = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getWallPlasterUrl(_,idx) {
+      this.currentCollapses[idx].wallPlaster = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getLightningUrl(_,idx) {
+      this.currentCollapses[idx].lightning = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getStarAniseUrl(_,idx) {
+      this.currentCollapses[idx].starAnise = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getProtectiveNetUrl(_,idx) {
+      this.currentCollapses[idx].protectiveNet = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getGroundHardeningUrl(_,idx) {
+      this.currentCollapses[idx].groundHardening = [...arguments][0][0].map(e=>e.url) || [];
+    },
     getUrl(_, idx) {
       this.currentCollapses[idx].zEngiineeringPhotoBoList = [...arguments][0][0].map(e => e.url) || [];
     },

src/components/EnginNodeInfo/index.vue

@@ -125,12 +125,12 @@
         <ObsImageUpload ref="wallPlaster" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.wallPlaster"
                         @input="getWallPlasterUrl"></ObsImageUpload>
       </el-form-item>
-      <el-form-item label="内壁抹灰" prop="protectiveNet" v-if="currentContain.includes('protectiveNet')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsImageUpload ref="protectiveNet" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.wallPlaster"
+      <el-form-item label="防护网" prop="protectiveNet" v-if="currentContain.includes('protectiveNet')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="protectiveNet" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.protectiveNet"
                         @input="getProtectiveNetUrl"></ObsImageUpload>
       </el-form-item>
-      <el-form-item label="内壁抹灰" prop="starAnise" v-if="currentContain.includes('starAnise')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsImageUpload ref="starAnise" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.wallPlaster"
+      <el-form-item label="八角" prop="starAnise" v-if="currentContain.includes('starAnise')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="starAnise" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.starAnise"
                         @input="getStarAniseUrl"></ObsImageUpload>
       </el-form-item>
 

src/components/EnginNodeInfo/indexGY.vue

@@ -6,10 +6,11 @@
  -->
 <template>
   <div style="width: 100%; height: 100%;">
-    <!-- 节点表单 -->
+    <!-- 节点表单 庭院 -->
     <el-form ref="fangxianForm" v-if="flag=='gy_out'" :model="nodeInfo" :rules="nodeRules" label-width="200px">
       <h2 style="margin-left: 16%;font-weight: 800;">{{ name }}</h2>
-      <el-form-item label="施工时间" prop="constructTime" :style=" 'margin-left: -27px' ">
+      <el-form-item label="施工时间" prop="constructTime"
+                    v-if="'调压柜' != name && '阀井'!==name&& '顶管材料米数'!==name&& '管道施工记录'!==name">
         <el-date-picker
           :disabled="formType"
           v-model="nodeInfo.constructTime"
@@ -19,20 +20,70 @@
         </el-date-picker>
       </el-form-item>
       <br>
-      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" v-if="'回填、撤场' != name">
-        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
+      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"
+                    v-if="'回填、撤场' != name && '调压柜' != name && '阀井'!==name&& '顶管材料米数'!==name">
+        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="铭牌" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'调压柜' === name">
+        <ObsImageUpload ref="boxBrand" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.boxBrand"
+                        @input="getboxBrandUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="底腿连接" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'调压柜' === name">
+        <ObsImageUpload ref="bottomLeg" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.bottomLeg"
+                        @input="getBottomLegUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="石粉回填" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'调压柜' === name">
+        <ObsImageUpload ref="stonePowder" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.stonePowder"
+                        @input="getstonePowderUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="防雷接地" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'调压柜' === name">
+        <ObsImageUpload ref="lightning" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.lightning"
+                        @input="getLightningUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="地面硬化" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'调压柜' === name">
+        <ObsImageUpload ref="groundHardening" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.groundHardening"
+                        @input="getGroundHardeningUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="套管" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'阀井' === name">
+        <ObsImageUpload ref="cannula" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.cannula"
+                        @input="getCannulaUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="内壁抹灰" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'阀井' === name">
+        <ObsImageUpload ref="wallPlaster" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.wallPlaster"
+                        @input="getWallPlasterUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="防护网" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'阀井' === name">
+        <ObsImageUpload ref="protectiveNet" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.protectiveNet"
+                        @input="getProtectiveNetUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="八角" prop="zEngiineeringPhotoBoList" class="obsImage tygImage" v-if="'阀井' === name">
+        <ObsImageUpload ref="starAnise" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.starAnise"
+                        @input="getStarAniseUrl"></ObsImageUpload>
+      </el-form-item>
       <el-form-item label="回填前" prop="zEngiineeringPhotoBoListOne" class="obsImage" v-if="'回填、撤场' == name">
-        <ObsImageUpload ref="obsImageUpload1" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoListOne"
+        <ObsImageUpload ref="obsImageUpload1" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoListOne"
                         @input="getUrl1"></ObsImageUpload>
       </el-form-item>
       <el-form-item label="铺设警示带" prop="zEngiineeringPhotoBoListTwo" class="obsImage" v-if="'回填、撤场' == name">
-        <ObsImageUpload ref="obsImageUpload2" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoListTwo"
+        <ObsImageUpload ref="obsImageUpload2" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoListTwo"
                         @input="getUrl2"></ObsImageUpload>
       </el-form-item>
       <el-form-item label="回填后" prop="zEngiineeringPhotoBoListThree" class="obsImage" v-if="'回填、撤场' == name">
-        <ObsImageUpload ref="obsImageUpload3" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoListThree"
+        <ObsImageUpload ref="obsImageUpload3" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoListThree"
                         @input="getUrl3"></ObsImageUpload>
       </el-form-item>
       <el-form-item label="文字说明" prop="remark" v-if="'隐蔽工程'== name">
@@ -43,10 +94,22 @@
           maxlength="255"
         />
       </el-form-item>
-      <div style="width: 25%;position: relative;left: 10.5%;top: -8px;" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)">
+      <el-form-item label="备注" prop="remark" v-if="'调压柜'== name || '阀井'===name|| '管道施工记录'===name">
+        <el-input
+          v-model="nodeInfo.remark"
+          type="textarea"
+          placeholder="请输入"
+          maxlength="255"
+        />
+      </el-form-item>
+      <div style="width: 25%;position: relative;left: 15.5%;top: -8px;"
+           v-if="['焊接、防腐','架空管线','下管','沟下连头','顶管材料米数'].includes(name)">
         <el-button @click="addMaterial()">新增用料信息</el-button>
       </div>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接、防腐','架空管线','下管','沟下连头'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo"
+              v-if="['焊接、防腐','架空管线','下管','沟下连头','顶管材料米数'].includes(name)" :key="index"
+              style="left: 10.5%;"
+              :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
@@ -54,7 +117,9 @@
             label="材质"
 
           >
-            <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(item, index)" filterable @blur="selectBlur(arguments,index,'materialQuality')">
+            <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%"
+                       @change="getEnginSpecificationsList(item, index)" filterable
+                       @blur="selectBlur(arguments,index,'materialQuality')">
               <el-option
                 v-for="e in materialQualityList"
                 :key="e.id"
@@ -71,7 +136,8 @@
             label="规格"
 
           >
-            <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 100%" filterable @blur="selectBlur(arguments,index,'specifications')">
+            <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 100%" filterable
+                       @blur="selectBlur(arguments,index,'specifications')">
               <el-option
                 v-for="e in specificationsList"
                 :key="e.id"
@@ -88,7 +154,11 @@
             label="米数"
           >
             <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>
+              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%"
+                        oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                        :disabled="status == 'read-only'">
+                <template slot="append">米</template>
+              </el-input>
             </div>
           </el-form-item>
         </el-col>
@@ -96,41 +166,46 @@
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.number'"
             label-width="50px"
-          ><div class="block" style="display: inline-block; margin-right: 20px;"></div></el-form-item>
-        </el-col>
-
-        <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
-            删除
-        </el-button>
-      </el-row>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index" style="left: 10.5%;" :class="'rowStructure'">
-        <el-col :span="7">
-          <el-form-item
-            :prop="'zEngineeringMaterialBo.' + index + '.remark'"
-            label-width="50px"
-            label="型号"
           >
-            <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input v-model="item.remark" placeholder="请输入型号" style="width: 100%" :disabled="status == 'read-only'"/>
-            </div>
+            <div class="block" style="display: inline-block; margin-right: 20px;"></div>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
-          <el-form-item
-            :prop="'zEngineeringMaterialBo.' + index + '.number'"
-            label-width="50px"
-          ><div class="block" style="display: inline-block; margin-right: 20px;"></div></el-form-item>
-        </el-col>
-
         <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
-            删除
+          删除
         </el-button>
       </el-row>
+      <!--      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['阀井'].includes(name)" :key="index"-->
+      <!--              style="left: 10.5%;" :class="'rowStructure'">-->
+      <!--        <el-col :span="7">-->
+      <!--          <el-form-item-->
+      <!--            :prop="'zEngineeringMaterialBo.' + index + '.remark'"-->
+      <!--            label-width="50px"-->
+      <!--            label="型号"-->
+      <!--          >-->
+      <!--            <div class="block" style="display: inline-block; margin-right: 20px;">-->
+      <!--              <el-input v-model="item.remark" placeholder="请输入型号" style="width: 100%"-->
+      <!--                        :disabled="status == 'read-only'"/>-->
+      <!--            </div>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="7">-->
+      <!--          <el-form-item-->
+      <!--            :prop="'zEngineeringMaterialBo.' + index + '.number'"-->
+      <!--            label-width="50px"-->
+      <!--          >-->
+      <!--            <div class="block" style="display: inline-block; margin-right: 20px;"></div>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+
+      <!--        <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">-->
+      <!--          删除-->
+      <!--        </el-button>-->
+      <!--      </el-row>-->
       <hr style="position: relative;left: 10%;">
     </el-form>
     <el-form ref="fangxianForm" v-if="flag=='gy_inner'" :model="nodeInfo" :rules="nodeRules" label-width="200px">
       <h2 style="margin-left: 16%;font-weight: 800;">{{ name }}</h2>
-      <el-form-item label="施工时间" prop="constructTime" :style=" 'margin-left: -27px' ">
+      <el-form-item label="施工时间" prop="constructTime">
         <el-date-picker
           :disabled="formType"
           v-model="nodeInfo.constructTime"
@@ -140,20 +215,24 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage">
-        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
+        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
       </el-form-item>
       <div style="width: 25%;position: relative;left: 20.5%;top: -8px;" v-if="['焊接'].includes(name)">
         <el-button @click="addMaterial()">新增用料信息</el-button>
       </div>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接'].includes(name)" :key="index" style="left: 13.5%;" :class="'rowStructure'">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" v-if="['焊接'].includes(name)" :key="index"
+              style="left: 13.5%;" :class="'rowStructure'">
         <el-col :span="7">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
             label-width="50px"
             label="材质"
           >
-            <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(item, index)" filterable @blur="selectBlur(arguments,index,'materialQuality')">
+            <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%"
+                       @change="getEnginSpecificationsList(item, index)" filterable
+                       @blur="selectBlur(arguments,index,'materialQuality')">
               <el-option
                 v-for="e in materialQualityList"
                 :key="e.id"
@@ -169,7 +248,8 @@
             label-width="50px"
             label="规格"
           >
-            <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 100%" filterable @blur="selectBlur(arguments,index,'specifications')">
+            <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 100%" filterable
+                       @blur="selectBlur(arguments,index,'specifications')">
               <el-option
                 v-for="e in specificationsList"
                 :key="e.id"
@@ -186,7 +266,11 @@
             label="米数"
           >
             <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>
+              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%"
+                        oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                        :disabled="status == 'read-only'">
+                <template slot="append">米</template>
+              </el-input>
             </div>
           </el-form-item>
         </el-col>
@@ -194,11 +278,13 @@
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.number'"
             label-width="50px"
-          ><div class="block" style="display: inline-block; margin-right: 20px;"></div></el-form-item>
+          >
+            <div class="block" style="display: inline-block; margin-right: 20px;"></div>
+          </el-form-item>
         </el-col>
 
         <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
-            删除
+          删除
         </el-button>
       </el-row>
       <hr style="position: relative;left: 10%;">
@@ -222,15 +308,108 @@
       >
         <div class="block" style="display: inline-block; margin-right: 20px;">
           <el-input v-model="nodeInfo.remark" placeholder="请输入施工内容" style="width: 100%" maxlength="100"
-                    type="textarea" ></el-input>
+                    type="textarea"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage">
-        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
+        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></ObsImageUpload>
       </el-form-item>
       <hr style="position: relative;left: 10%;">
     </el-form>
+    <el-form ref="fangxianForm" v-if="flag=='gy_jkgx' || flag=='gy_log_every_day'" :model="nodeInfo" :rules="nodeRules"
+             label-width="200px">
+      <h2 style="margin-left: 16%;font-weight: 800;">{{ name }}</h2>
+      <el-form-item
+        :prop="nodeInfo.remark"
+        :class="'labelWidth'"
+        label="施工内容"
+        label-width="200px"
+      >
+        <div class="block" style="display: inline-block; margin-right: 20px;">
+          <el-input v-model="nodeInfo.remark" placeholder="请输入施工内容" style="width: 100%" maxlength="100"
+                    type="textarea"></el-input>
+        </div>
+      </el-form-item>
+      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage">
+        <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
+                        :value="nodeInfo.zEngiineeringPhotoBoList"
+                        @input="getUrl"></ObsImageUpload>
+      </el-form-item>
+      <div style="width: 25%;position: relative;left: 15.5%;top: -8px;"
+           v-if="['焊接、防腐','架空管线','下管','沟下连头','顶管材料米数'].includes(name)">
+        <el-button @click="addMaterial()">新增用料信息</el-button>
+      </div>
+      <el-row v-for="(item, index) in zEngineeringMaterialBo"
+              v-if="['除锈刷油','全貌照片'].includes(name)" :key="index" style="left: 10.5%;"
+              :class="'rowStructure'">
+        <el-col :span="7">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
+            label-width="50px"
+            label="材质"
+
+          >
+            <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%"
+                       @change="getEnginSpecificationsList(item, index)" filterable
+                       @blur="selectBlur(arguments,index,'materialQuality')">
+              <el-option
+                v-for="e in materialQualityList"
+                :key="e.id"
+                :label="e.name"
+                :value="e.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.specifications'"
+            label-width="50px"
+            label="规格"
+
+          >
+            <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 100%" filterable
+                       @blur="selectBlur(arguments,index,'specifications')">
+              <el-option
+                v-for="e in specificationsList"
+                :key="e.id"
+                :label="e.name"
+                :value="e.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.number'"
+            label-width="50px"
+            label="米数"
+          >
+            <div class="block" style="display: inline-block; margin-right: 20px;">
+              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%"
+                        oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
+                        :disabled="status == 'read-only'">
+                <template slot="append">米</template>
+              </el-input>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.number'"
+            label-width="50px"
+          >
+            <div class="block" style="display: inline-block; margin-right: 20px;"></div>
+          </el-form-item>
+        </el-col>
+        <el-button v-if="zEngineeringMaterialBo.length > 0" @click="removezEngineeringMaterialBo(index)">
+          删除
+        </el-button>
+      </el-row>
+      <hr style="position: relative;left: 10%;">
+    </el-form>
   </div>
 </template>
 
@@ -242,61 +421,58 @@ import {
 
 } from '@/api/zdsz/enginee'
 import ObsVideoUpload from "@/components/ObsVideoUpload/index.vue";
+
 export default {
-  name:'EnginNodeInfoGY',
-  props:['types','enginType','enginSort','enginNode','name','currentContain','updateOption','status','flag'],
-  components:{ObsVideoUpload},
-  data(){
+  name: 'EnginNodeInfoGY',
+  props: ['types', 'enginType', 'enginSort', 'enginNode', 'name', 'currentContain', 'updateOption', 'status', 'flag'],
+  components: {ObsVideoUpload},
+  data() {
     return {
-      constructAccordingDrawingsOption:[
+      constructAccordingDrawingsOption: [
         {
-          value:'Y',
-          label:'是'
+          value: 'Y',
+          label: '是'
         },
         {
-          value:'N',
-          label:'否'
+          value: 'N',
+          label: '否'
         }
       ],
-      segmentedCompressionQualifiedOption:[
+      segmentedCompressionQualifiedOption: [
         {
-          value:'1',
-          label:'合格'
+          value: '1',
+          label: '合格'
         },
         {
-          value:'0',
-          label:'不合格'
+          value: '0',
+          label: '不合格'
         }
       ],
-      materialQualityList_zbf:[],                      // 自闭阀option
-      materialQualityList_zjg:[],                      // 灶具管option
-      materialQualityList:[],                     // 材质
-      specificationsList:[],                      // 规格
-      materialComponList:[],
-      nodeInfo:{
-        backfillTime:'',                        // 回填时间
-        constructTime:'',
-        constructAccordingDrawings:'',
-        segmentedCompressionQualified:'',
-        zEngiineeringPhotoBoList:[],            // 照片集合
-        zEngiineeringPhotoBoListOne:[],            // 照片集合
-        zEngiineeringPhotoBoListTwo:[],            // 照片集合
-        zEngiineeringPhotoBoListThree:[],            // 照片集合
-        zEngineeringMaterialBo:[],              // 用料集合
-        remark:'',
-        constructAddre:''
+      materialQualityList_zbf: [],                      // 自闭阀option
+      materialQualityList_zjg: [],                      // 灶具管option
+      materialQualityList: [],                     // 材质
+      specificationsList: [],                      // 规格
+      materialComponList: [],
+      nodeInfo: {
+        backfillTime: '',                        // 回填时间
+        constructTime: '',
+        constructAccordingDrawings: '',
+        segmentedCompressionQualified: '',
+        zEngiineeringPhotoBoList: [],            // 照片集合
+        zEngiineeringPhotoBoListOne: [],            // 照片集合
+        zEngiineeringPhotoBoListTwo: [],            // 照片集合
+        zEngiineeringPhotoBoListThree: [],            // 照片集合
+        zEngineeringMaterialBo: [],              // 用料集合
+        remark: '',
+        constructAddre: ''
       },
-      nodeInfoBo:{
-        zEngineeringInfoBo:{
-
-        }
+      nodeInfoBo: {
+        zEngineeringInfoBo: {}
       },                                         //  节点信息
-      zEngineeringMaterialBo:[
-
-      ],                                         //  用料信息
-      nodeRules:{
+      zEngineeringMaterialBo: [],                                         //  用料信息
+      nodeRules: {
         zEngiineeringPhotoBoList: [
-          {required: true, message: "至少上传一张图片", trigger: "change"}
+          {required: false, message: "至少上传一张图片", trigger: "change"}
         ],
         constructTime: [
           {required: true, message: "请选择施工时间", trigger: "change"}
@@ -304,28 +480,28 @@ export default {
       }
     }
   },
-  created(){
-      // 获取材质
-      let enginType = '工业工程'
-      getEnginMaterialQualityList({enginType:enginType}).then(res => {
-        this.materialQualityList = res.data
-      })
+  created() {
+    // 获取材质
+    let enginType = '工业工程'
+    getEnginMaterialQualityList({enginType: enginType}).then(res => {
+      this.materialQualityList = res.data
+    })
   },
-  mounted(){
-    console.log('当前节点name',this.name)
-    console.log('update',this.updateOption)
-    console.log('当前节点currentContain',this.types)
+  mounted() {
+    console.log('当前节点name', this.name)
+    console.log('update', this.updateOption)
+    console.log('当前节点currentContain', this.types)
     this.materialComponList = this.currentContain.find(e => {
-      if( e instanceof Array){
+      if (e instanceof Array) {
         return e
       }
 
     })
 
-    if(this.status == '修改'){
+    if (this.status == '修改') {
       this.currentContain.find(e => {
         console.log(this.updateOption)
-        if( e instanceof Array){
+        if (e instanceof Array) {
           this.zEngineeringMaterialBo = this.updateOption.zEngineeringInfoBoList[0].zEngineeringMaterialBo
         }
         this.nodeInfo[e] = this.updateOption[e]
@@ -338,49 +514,59 @@ export default {
     setTimeout(() => {
       // 至少存在一条物料
       this.addMaterial()
-    },1500)
-    console.log('用料组件',this.materialComponList)
-    console.log('用料信息',this.zEngineeringMaterialBo)
-    console.log('节点信息',this.nodeInfo)
+    }, 1500)
+    console.log('用料组件', this.materialComponList)
+    console.log('用料信息', this.zEngineeringMaterialBo)
+    console.log('节点信息', this.nodeInfo)
     // 添加用料对象
     // this.addMaterial()
   },
-  methods:{
-    selectBlur(_,index,name) {
+  methods: {
+    selectBlur(_, index, name) {
       this.zEngineeringMaterialBo[index][name] = [...arguments][0][0].target.value
     },
     // 收集节点信息
-    infoCollection(){
+    infoCollection() {
       let result = null
       console.log(this.$refs.fangxianForm)
       this.$refs.fangxianForm.validate(valid => {
-        if(valid){
+        if (valid) {
           // 收集主节点信息
           this.currentContain.forEach(e => {
-            if( e instanceof Array){
+            if (e instanceof Array) {
               // 包含用料 特殊处理
               return
             }
             this.nodeInfoBo[e] = this.nodeInfo[e]
           })
           this.nodeInfoBo.type = this.name
-          if (this.name!='回填、撤场'){
+          if (this.name != '回填、撤场') {
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = []
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.nodeInfo.zEngiineeringPhotoBoList
           }
-          if (this.name=='回填、撤场'){
+          if (this.name == '回填、撤场') {
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListOne = []
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListTwo = []
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListThree = []
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListOne = this.nodeInfo.zEngiineeringPhotoBoListOne
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListTwo = this.nodeInfo.zEngiineeringPhotoBoListTwo
             this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoListThree = this.nodeInfo.zEngiineeringPhotoBoListThree
-          }          this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
-          this.nodeInfoBo.zEngineeringInfoBo.constructAddre=this.nodeInfo.constructAddre
-          this.nodeInfoBo.zEngineeringInfoBo.constructTime=this.nodeInfo.constructTime
-          this.nodeInfoBo.zEngineeringInfoBo.remark=this.nodeInfo.remark
+          }
+          this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
+          this.nodeInfoBo.zEngineeringInfoBo.constructAddre = this.nodeInfo.constructAddre
+          this.nodeInfoBo.zEngineeringInfoBo.constructTime = this.nodeInfo.constructTime
+          this.nodeInfoBo.zEngineeringInfoBo.boxBrand = this.nodeInfo.boxBrand
+          this.nodeInfoBo.zEngineeringInfoBo.lightning = this.nodeInfo.lightning
+          this.nodeInfoBo.zEngineeringInfoBo.bottomLeg = this.nodeInfo.bottomLeg
+          this.nodeInfoBo.zEngineeringInfoBo.stonePowder = this.nodeInfo.stonePowder
+          this.nodeInfoBo.zEngineeringInfoBo.groundHardening = this.nodeInfo.groundHardening
+          this.nodeInfoBo.zEngineeringInfoBo.cannula = this.nodeInfo.cannula
+          this.nodeInfoBo.zEngineeringInfoBo.wallPlaster = this.nodeInfo.wallPlaster
+          this.nodeInfoBo.zEngineeringInfoBo.protectiveNet = this.nodeInfo.protectiveNet
+          this.nodeInfoBo.zEngineeringInfoBo.starAnise = this.nodeInfo.starAnise
+          this.nodeInfoBo.zEngineeringInfoBo.remark = this.nodeInfo.remark
           // delete this.nodeInfo.zEngiineeringPhotoBoList
-          console.log('即将返回的节点Info',this.nodeInfoBo)
+          console.log('即将返回的节点Info', this.nodeInfoBo)
           result = this.nodeInfoBo
         } else {
           this.$message({
@@ -392,7 +578,7 @@ export default {
       })
       return result
     },
-    addMaterial(){
+    addMaterial() {
       let materialBo = {}
       // this.materialComponList.forEach(e => {
       //   materialBo[e] = null
@@ -401,7 +587,7 @@ export default {
       this.nodeInfo.zEngineeringMaterialBo.push(materialBo)
       // console.log('节点用料参数对象',this.zEngineeringMaterialBo)
     },
-    addzEngineeringMaterialBo(option,params){
+    addzEngineeringMaterialBo(option, params) {
       let material = {}
       params.forEach(e => {
         material[e] = ""
@@ -410,29 +596,56 @@ export default {
         material
       )
     },
-    removezEngineeringMaterialBo(index){
+    removezEngineeringMaterialBo(index) {
       this.zEngineeringMaterialBo.splice(index, 1);
     },
     // 填充已有数据
-    updateInfo(e){
-      console.log('填充',e)
+    updateInfo(e) {
+      console.log('填充', e)
     },
     getUrl(url) {
-      this.nodeInfo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
+      this.nodeInfo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
+    },
+    getProtectiveNetUrl(url) {
+      this.nodeInfo.protectiveNet = this.$refs.protectiveNet.fileList ? this.$refs.protectiveNet.fileList.map(e => e.url) : [];
+    },
+    getWallPlasterUrl(url) {
+      this.nodeInfo.wallPlaster = this.$refs.wallPlaster.fileList ? this.$refs.wallPlaster.fileList.map(e => e.url) : [];
+    },
+    getStarAniseUrl(url) {
+      this.nodeInfo.starAnise = this.$refs.starAnise.fileList ? this.$refs.starAnise.fileList.map(e => e.url) : [];
+    },
+    getCannulaUrl(url) {
+      this.nodeInfo.cannula = this.$refs.cannula.fileList ? this.$refs.cannula.fileList.map(e => e.url) : [];
+    },
+    getGroundHardeningUrl(url) {
+      this.nodeInfo.groundHardening = this.$refs.groundHardening.fileList ? this.$refs.groundHardening.fileList.map(e => e.url) : [];
+    },
+    getLightningUrl(url) {
+      this.nodeInfo.lightning = this.$refs.lightning.fileList ? this.$refs.lightning.fileList.map(e => e.url) : [];
+    },
+    getboxBrandUrl(url) {
+      this.nodeInfo.boxBrand = this.$refs.boxBrand.fileList ? this.$refs.boxBrand.fileList.map(e => e.url) : [];
+    },
+    getBottomLegUrl(url) {
+      this.nodeInfo.bottomLeg = this.$refs.bottomLeg.fileList ? this.$refs.bottomLeg.fileList.map(e => e.url) : [];
+    },
+    getstonePowderUrl(url) {
+      this.nodeInfo.stonePowder = this.$refs.stonePowder.fileList ? this.$refs.stonePowder.fileList.map(e => e.url) : [];
     },
     getUrl1(url) {
-      this.nodeInfo.zEngiineeringPhotoBoListOne = this.$refs.obsImageUpload1.fileList ? this.$refs.obsImageUpload1.fileList.map(e=>e.url):[];
+      this.nodeInfo.zEngiineeringPhotoBoListOne = this.$refs.obsImageUpload1.fileList ? this.$refs.obsImageUpload1.fileList.map(e => e.url) : [];
     },
     getUrl2(url) {
-      this.nodeInfo.zEngiineeringPhotoBoListTwo = this.$refs.obsImageUpload2.fileList ? this.$refs.obsImageUpload2.fileList.map(e=>e.url):[];
+      this.nodeInfo.zEngiineeringPhotoBoListTwo = this.$refs.obsImageUpload2.fileList ? this.$refs.obsImageUpload2.fileList.map(e => e.url) : [];
     },
     getUrl3(url) {
-      this.nodeInfo.zEngiineeringPhotoBoListThree = this.$refs.obsImageUpload3.fileList ? this.$refs.obsImageUpload3.fileList.map(e=>e.url):[];
+      this.nodeInfo.zEngiineeringPhotoBoListThree = this.$refs.obsImageUpload3.fileList ? this.$refs.obsImageUpload3.fileList.map(e => e.url) : [];
     },
     // 获取材质规格
-    getEnginSpecificationsList(e,idx){
+    getEnginSpecificationsList(e, idx) {
       this.zEngineeringMaterialBo[idx].specifications = null;
-      getEnginSpecificationsList({materId:e.materialQuality}).then(res => {
+      getEnginSpecificationsList({materId: e.materialQuality}).then(res => {
         this.specificationsList = res.data
       })
     },
@@ -442,49 +655,56 @@ export default {
 
 <style lang="scss" scoped>
 
-::v-deep .material_desc{
-  .el-form-item__content{
+::v-deep .material_desc {
+  .el-form-item__content {
     margin-left: 50px !important;
   }
 }
-::v-deep .el-form{
+
+::v-deep .el-form {
   position: relative;
   left: -10%;
-  .el-form-item{
+
+  .el-form-item {
     display: inline-block;
   }
-  .obsImage{
+
+  .obsImage {
     width: 100%;
     display: block;
     margin-left: 8%;
-    .el-form-item__label{
-      width: 113px !important;
+
+    .el-form-item__label {
+      width: 160px !important;
     }
-    .el-form-item__error{
+
+    .el-form-item__error {
       position: relative;
       left: -10%;
     }
   }
 
-  .obsActiveImage{
-    .el-form{
-        left:-14% !important
+  .obsActiveImage {
+    .el-form {
+      left: -14% !important
     }
-    .el-form-item__label{
+
+    .el-form-item__label {
       width: 97px !important;
     }
   }
 
-  .obsActiveImageStructure{
-    .el-form-item__label{
-      width:161px !important;
+  .obsActiveImageStructure {
+    .el-form-item__label {
+      width: 161px !important;
     }
   }
 
-  .rowStructure{
+  .rowStructure {
     padding-left: 3.6%;
-    .el-col .el-form-item{
-      width:73%
+
+    .el-col .el-form-item {
+      width: 73%
     }
   }
 }

src/views/zdsz/engineeringGY/index.vue

@@ -373,8 +373,8 @@
 
         <el-row v-if="title=='添加用料'">
           <el-col :span="24">
-            <el-form-item label="环节">
-              <el-checkbox-group v-model="currentCheckList" style="display: flex">
+            <el-form-item label="环节" class="hjclass">
+              <el-checkbox-group v-model="currentCheckList" style="display: flex;flex-wrap: wrap;">
                 <el-checkbox
                   :label="item.dictValue"
                   v-for="item in nodeList"
@@ -819,23 +819,23 @@ export default {
       specificationsList: [], // 用料规格List
       // 表单校验
       rules: {
-        enginName: [
-          {required: true, validator:function(rule, value, callback) {
-            if(value == null || value == ''){
-              callback(new Error("工程名称不能为空"))
-            }else {
-              testEnginNameUnique({enginName: value, enginType: '工业工程'}).then(res => {
-                if(!res.data){
-                  callback(new Error("工程名称不能重复"))
-                }else {
-                  // callback(new Error("工程名称可以使用"))
-                }
-              });
-
-              // callback(new Error("123"))
-            }
-          }, trigger: 'blur'}
-        ],
+        // enginName: [
+        //   {required: true, validator:function(rule, value, callback) {
+        //     if(value == null || value == ''){
+        //       callback(new Error("工程名称不能为空"))
+        //     }else {
+        //       testEnginNameUnique({enginName: value, enginType: '工业工程'}).then(res => {
+        //         if(!res.data){
+        //           callback(new Error("工程名称不能重复"))
+        //         }else {
+        //           // callback(new Error("工程名称可以使用"))
+        //         }
+        //       });
+        //
+        //       // callback(new Error("123"))
+        //     }
+        //   }, trigger: 'blur'}
+        // ],
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: 'blur'}
         ],
@@ -1101,6 +1101,10 @@ export default {
         str = 'gy_out'
       } else if (value == '调压柜') {
         str = 'gy_tyg'
+      } else if (value == '架空管线') {
+        str = 'gy_jkgx'
+      } else if (value == '每日施工日志') {
+        str = 'gy_log_every_day'
       } else {
         return;
       }
@@ -1409,7 +1413,9 @@ export default {
 
 
 <style lang="scss" scoped>
-
+.hjclass{
+  width: 100% !important;
+}
 
 ::v-deep .appendElDialog {
   width: 70%;

src/views/zdsz/touchOperationEngineering/index.vue

@@ -423,17 +423,17 @@ export default {
       this.currentId = e.id
       let dict = []
       let dists = e.modeOperation;
-      // if ("地埋扳孔"  == e.modeOperation){
-      //   dists="bury_the_wrench_hole";
-      // }else if ("架空扳孔"  == e.modeOperation){
-      //   dists="aerial_wrench_hole";
-      // }else if ("停气作业"  == e.modeOperation){
-      //   dists="shutdown_operation";
-      // }else if ("PE 封堵"  == e.modeOperation){
-      //   dists="pe_plugging";
-      // }else if ("钢管带气封堵"  == e.modeOperation){
-      //   dists="the_steel_pipe_sealed_with_gas";
-      // }
+      if ("地埋扳孔"  == e.modeOperation){
+        dists="bury_the_wrench_hole";
+      }else if ("架空扳孔"  == e.modeOperation){
+        dists="aerial_wrench_hole";
+      }else if ("停气作业"  == e.modeOperation){
+        dists="shutdown_operation";
+      }else if ("PE 封堵"  == e.modeOperation){
+        dists="pe_plugging";
+      }else if ("钢管带气封堵"  == e.modeOperation){
+        dists="the_steel_pipe_sealed_with_gas";
+      }
       getDicts(dists).then(res => {
         this.nodeList = res.data
         for (let i = 0; i < this.nodeList.length; i++) {