提交代码

src/components/ConstructionDetails/index.vue

@@ -145,7 +145,7 @@
                       :prop="i.materialQuality"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       :label="activeNames == '阀管' ? '灶具管厂家': '材质'"
-                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating'))"
+                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating')) && node !== '阀井'"
                       label-width="95px"
                       >
                       <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
@@ -161,7 +161,7 @@
                       :prop="i.specifications"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="规格"
-                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating'))"
+                      v-show="i.materialQuality != null || (enginClassification != null && !enginClassification.includes('pressure_regulating')) && node !== '阀井'"
                       label-width="95px"
 
                       >
@@ -226,7 +226,7 @@
                   </el-form-item>
 
                     <el-form-item
-                      v-if="!currentDicts.some(item=>item.label==='底腿')"
+                      v-if="!currentDicts.some(item=>item.label==='底腿') && node !== '阀井'"
                       :prop="i.number + ''"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="数量"
@@ -343,6 +343,7 @@
               !(node==='iron_air')&&
               !(node==='pe')&&
               !(node=='回填')&&
+              !(node=='阀井')&&
               !(node=='trench_construction')&&
               !(node=='underditch_construction')
            "
@@ -646,6 +647,54 @@
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='阀井'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">套管</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getCannulaUrl(arguments,idx)"
+                :value="e.cannula"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='阀井'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">内壁抹灰</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getWallPlasterUrl(arguments,idx)"
+                :value="e.wallPlaster"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='阀井'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">防护网</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getProtectiveNetUrl(arguments,idx)"
+                :value="e.protectiveNet"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='阀井'">
+              <h3 style="width: 95px;font-weight: 600;text-align: left;text-indent: 25px;">八角</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getStarAniseUrl(arguments,idx)"
+                :value="e.starAnise"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
             <div style="display: flex;width: 100%;height: 100%;" v-if="node==='下沟'">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 25px;">管沟远景照片</h3>
               <ObsImageUpload
@@ -1112,6 +1161,7 @@ export default {
     viewSource(e) {
       console.log('节点123',e)
       console.log('节点',e)
+
       this.node=e.name
       // alert(this.node)
       this.nodesource=e
@@ -1304,6 +1354,19 @@ export default {
     gettrenchProspectUrl(_,idx) {
       this.currentCollapses[idx].trenchProspect = [...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) || [];
+    },
+    getProtectiveNetUrl(_,idx) {
+      this.currentCollapses[idx].protectiveNet = [...arguments][0][0].map(e=>e.url) || [];
+    },
+    getStarAniseUrl(_,idx) {
+      this.currentCollapses[idx].starAnise = [...arguments][0][0].map(e=>e.url) || [];
+    },
     getstonePowderUrl(_,idx) {
       this.currentCollapses[idx].stonePowder = [...arguments][0][0].map(e=>e.url) || [];
     },

src/components/EnginNodeInfo/index.vue

@@ -71,22 +71,22 @@
         <ObsImageUpload ref="photosAfter" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.photosAfter"
                         @input="getphotosAfterUrl"></ObsImageUpload>
       </el-form-item>
-
-      <el-form-item label="沟上部分" prop="constructionRecords" v-if="currentContain.includes('onTheDitch')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsImageUpload ref="onTheDitch" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.onTheDitch"
-                        @input="getonTheDitchUrl"></ObsImageUpload>
-      </el-form-item>
       <el-form-item label="开挖前" prop="beforeBottom" v-if="currentContain.includes('beforeBottom')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsImageUpload ref="beforeBottom" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.beforeBottom"
                         @input="getbeforeBottomUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="下沟" prop="legBackfilling" v-if="currentContain.includes('legBackfilling')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="legBackfilling" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.legBackfilling"
+                        @input="getlegBackfillingUrl"></ObsImageUpload>
+      </el-form-item>
       <el-form-item label="回填" prop="inferiorSulcus" v-if="currentContain.includes('inferiorSulcus')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsImageUpload ref="inferiorSulcus" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.inferiorSulcus"
                         @input="getinferiorSulcusUrl"></ObsImageUpload>
       </el-form-item>
-      <el-form-item label="下沟" prop="legBackfilling" v-if="currentContain.includes('legBackfilling')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsImageUpload ref="legBackfilling" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.legBackfilling"
-                        @input="getlegBackfillingUrl"></ObsImageUpload>
+
+      <el-form-item label="安装完成" prop="constructionRecords" v-if="currentContain.includes('onTheDitch')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="onTheDitch" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.onTheDitch"
+                        @input="getonTheDitchUrl"></ObsImageUpload>
       </el-form-item>
 
       <el-form-item label="视频" prop="Video" v-if="currentContain.includes('Video')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
@@ -113,6 +113,26 @@
         <ObsImageUpload ref="GroundHardening" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.groundHardening"
                         @input="getGroundHardeningUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="地面硬化" prop="GroundHardening" v-if="currentContain.includes('GroundHardeningA')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="GroundHardening" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.groundHardening"
+                        @input="getGroundHardeningUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="套管" prop="cannula" v-if="currentContain.includes('cannula')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="cannula" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.cannula"
+                        @input="getCannulaUrl"></ObsImageUpload>
+      </el-form-item>
+      <el-form-item label="内壁抹灰" prop="wallPlaster" v-if="currentContain.includes('wallPlaster')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <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"
+                        @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"
+                        @input="getStarAniseUrl"></ObsImageUpload>
+      </el-form-item>
 
       <el-form-item label="备注" prop="remark" v-if="currentContain.includes('remark')">
         <el-input
@@ -433,12 +453,12 @@ export default {
         zEngiineeringPhotoBoList: [
           {required: true, message: "至少上传一张图片", trigger: "change"}
         ],
-        constructTime: [
-          {required: true, message: "请选择施工时间", trigger: "change"}
-        ],
-        brand:[
-          {required: true, message: "请选择品牌", trigger: "change"}
-        ]
+        // constructTime: [
+        //   {required: true, message: "请选择施工时间", trigger: "change"}
+        // ],
+        // brand:[
+        //   {required: true, message: "请选择品牌", trigger: "change"}
+        // ]
       }
     }
   },
@@ -545,6 +565,10 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.lightning=this.nodeInfo.lightning
           this.nodeInfoBo.zEngineeringInfoBo.bottomLeg=this.nodeInfo.bottomLeg
           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)
@@ -620,6 +644,18 @@ export default {
     getGroundHardeningUrl(url) {
       this.nodeInfo.groundHardening = this.$refs.GroundHardening.fileList ? this.$refs.GroundHardening.fileList.map(e=>e.url):[];
     },
+    getCannulaUrl(url) {
+      this.nodeInfo.cannula = this.$refs.cannula.fileList ? this.$refs.cannula.fileList.map(e=>e.url):[];
+    },
+    getWallPlasterUrl(url) {
+      this.nodeInfo.wallPlaster = this.$refs.wallPlaster.fileList ? this.$refs.wallPlaster.fileList.map(e=>e.url):[];
+    },
+    getProtectiveNetUrl(url) {
+      this.nodeInfo.protectiveNet = this.$refs.protectiveNet.fileList ? this.$refs.protectiveNet.fileList.map(e=>e.url):[];
+    },
+    getStarAniseUrl(url) {
+      this.nodeInfo.starAnise = this.$refs.starAnise.fileList ? this.$refs.starAnise.fileList.map(e=>e.url):[];
+    },
     getBottomLegUrl(url) {
       this.nodeInfo.bottomLeg = this.$refs.BottomLeg.fileList ? this.$refs.BottomLeg.fileList.map(e=>e.url):[];
     },

src/views/zdsz/engineeringCivil/index.vue

@@ -1093,7 +1093,7 @@ export default {
               'number',                                // 数量
             ],
             'ductalEpithelium',
-            'constructionRecords',
+            // 'constructionRecords',
             'trenchProspect',
             'constructTime',
             'Video'// 施工时间
@@ -1132,6 +1132,40 @@ export default {
             // 'remark',                                  // 施工内容
           ]
         },
+        {
+          name: '管道施工记录',
+          components: [
+            [
+            ],
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',                                  // 施工内容
+          ]
+        },
+        {
+          name: '调压柜',
+          components: [
+            [
+            ],
+            'boxBrand',
+            'BottomLeg',
+            'stonePowder',
+            'Lightning',
+            'GroundHardeningA',
+            'remark',                                  // 施工内容
+          ]
+        },
+        {
+          name: '阀井',
+          components: [
+            [
+            ],
+            'cannula',
+            'wallPlaster',
+            'protectiveNet',
+            'starAnise',
+            'remark',                                  // 施工内容
+          ]
+        },
         ///////////////////////////////////////////////庭院工程//////////////////////////////////////////
         ///////////////////////////////////////////////架空工程//////////////////////////////////////////
         {
@@ -1148,6 +1182,19 @@ export default {
           ]
         },
         {
+          name: '焊接',
+          components: [
+            [
+              'materialQuality',                       // 材质
+              'specifications',                        // 规格
+              'number',                                // 数量
+            ],
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            // 'remark',                                  // 施工内容
+          ]
+        },
+        {
           name: '打磨',
           components: [
             [
@@ -1595,7 +1642,6 @@ export default {
       })
     },
     addNodeInfo(e) {
-      console.log('e', 11111)
       this.nodeDetailType = '修改'
       this.enginId = e.id
       this.status = 'put'
@@ -1627,6 +1673,7 @@ export default {
         try {
           this.updateParams = res.data
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
+          console.log("this.currentCollapses", this.currentCollapses)
           this.$refs.ConstructionDetails.setEngineId(res.data.zEngineeringNodeBo.id || null)
         } catch (error) {
           this.currentCollapses = [];