202406市政修改

src/components/ConstructionDetails/indexSZ.vue

@@ -146,7 +146,7 @@
                     </el-form-item>
                   </el-form>
                 </div>
-                <div style="display: flex;width: 100%;height: 100%;">
+                <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' : '' "
@@ -158,6 +158,42 @@
                     :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="obsImageUpload1"
+                    :limit="11"
+                    :fileType="['png', 'jpg', 'jpeg']"
+                    @input="getUrl1(arguments,idx)"
+                    :value="e.zEngiineeringPhotoBoListOne"
+                    :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="obsImageUpload2"
+                    :limit="11"
+                    :fileType="['png', 'jpg', 'jpeg']"
+                    @input="getUrl2(arguments,idx)"
+                    :value="e.zEngiineeringPhotoBoListTwo"
+                    :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="obsImageUpload3"
+                    :limit="11"
+                    :fileType="['png', 'jpg', 'jpeg']"
+                    @input="getUrl3(arguments,idx)"
+                    :value="e.zEngiineeringPhotoBoListThree"
+                    :disabled="['review','read-only'].includes(status)"
+                  ></ObsImageUpload>
+                </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)"
@@ -272,6 +308,9 @@ export default {
         constructAccordingDrawings: '',
         segmentedCompressionQualified: '',
         zEngiineeringPhotoBoList: [],            // 照片集合
+        zEngiineeringPhotoBoListOne: [],            // 照片集合
+        zEngiineeringPhotoBoListTwo: [],            // 照片集合
+        zEngiineeringPhotoBoListThree: [],            // 照片集合
         zEngineeringMaterialBo: [],              // 用料集合
         remark: '',
         constructAddre: ''
@@ -504,6 +543,15 @@ export default {
     getUrl(_, idx) {
       this.currentCollapses[idx].zEngiineeringPhotoBoList = [...arguments][0][0].map(e => e.url) || [];
     },
+    getUrl1(_, idx) {
+      this.currentCollapses[idx].zEngiineeringPhotoBoListOne = [...arguments][0][0].map(e => e.url) || [];
+    },
+    getUrl2(_, idx) {
+      this.currentCollapses[idx].zEngiineeringPhotoBoListTwo = [...arguments][0][0].map(e => e.url) || [];
+    },
+    getUrl3(_, idx) {
+      this.currentCollapses[idx].zEngiineeringPhotoBoListThree = [...arguments][0][0].map(e => e.url) || [];
+    },
   }
 }
 </script>

src/components/EnginNodeInfo/indexSZ.vue

@@ -18,10 +18,22 @@
           placeholder="请选择施工时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" >
+      <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage" v-if="'回填、撤场' != name">
         <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.zEngiineeringPhotoBoList"
                         @input="getUrl"></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"
+                        @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"
+                        @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"
+                        @input="getUrl3"></ObsImageUpload>
+      </el-form-item>
       <el-form-item label="施工内容" prop="remark">
         <el-input
           v-model="nodeInfo.remark"
@@ -170,6 +182,9 @@ export default {
         constructAccordingDrawings:'',
         segmentedCompressionQualified:'',
         zEngiineeringPhotoBoList:[],            // 照片集合
+        zEngiineeringPhotoBoListOne:[],            // 照片集合
+        zEngiineeringPhotoBoListTwo:[],            // 照片集合
+        zEngiineeringPhotoBoListThree:[],            // 照片集合
         zEngineeringMaterialBo:[],              // 用料集合
         remark:'',
         constructAddre:''
@@ -219,6 +234,8 @@ export default {
         this.nodeInfo[e] = this.updateOption[e]
       })
       this.nodeInfo.zEngiineeringPhotoBoList = this.updateOption.zEngineeringInfoBoList[0].zEngiineeringPhotoBoList
+      this.nodeInfo.zEngiineeringPhotoBoListOne = this.updateOption.zEngineeringInfoBoList[0].zEngiineeringPhotoBoListOne
+      this.nodeInfo.zEngiineeringPhotoBoListTwo = this.updateOption.zEngineeringInfoBoList[0].zEngiineeringPhotoBoListTwo
     }
 
     setTimeout(() => {
@@ -251,11 +268,22 @@ export default {
           })
           this.nodeInfoBo.type = this.name
           // 接口数据格式修改 图片和用料放到nodeInfoBo节点详情对象中
-          this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.nodeInfo.zEngiineeringPhotoBoList
+          if (this.name=='回填、撤场'){
+            this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = []
+            this.nodeInfoBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.nodeInfo.zEngiineeringPhotoBoList
+          }
+          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
-          delete this.nodeInfo.zEngiineeringPhotoBoList
+          // delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
           result = this.nodeInfoBo
         } else {
@@ -296,50 +324,14 @@ export default {
     getUrl(url) {
       this.nodeInfo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
     },
-    getductalEpitheliumUrl(url) {
-      this.nodeInfo.ductalEpithelium = this.$refs.ductalEpithelium.fileList ? this.$refs.ductalEpithelium.fileList.map(e=>e.url):[];
-    },
-    getstonePowderUrl(url) {
-      this.nodeInfo.stonePowder = this.$refs.stonePowder.fileList ? this.$refs.stonePowder.fileList.map(e=>e.url):[];
-    },
-    gettrenchProspectUrl(url) {
-      this.nodeInfo.trenchProspect = this.$refs.trenchProspect.fileList ? this.$refs.trenchProspect.fileList.map(e=>e.url):[];
-    },
-    getwarningtTapeUrl(url) {
-      this.nodeInfo.warningtTape = this.$refs.warningtTape.fileList ? this.$refs.warningtTape.fileList.map(e=>e.url):[];
-    },
-    getphotosAfterUrl(url) {
-      this.nodeInfo.photosAfter = this.$refs.photosAfter.fileList ? this.$refs.photosAfter.fileList.map(e=>e.url):[];
-    },
-    getbeforeBottomUrl(url) {
-      this.nodeInfo.beforeBottom = this.$refs.beforeBottom.fileList ? this.$refs.beforeBottom.fileList.map(e=>e.url):[];
-    },
-    getlegBackfillingUrl(url) {
-      this.nodeInfo.legBackfilling = this.$refs.legBackfilling.fileList ? this.$refs.legBackfilling.fileList.map(e=>e.url):[];
-    },
-    getinferiorSulcusUrl(url) {
-      this.nodeInfo.inferiorSulcus = this.$refs.inferiorSulcus.fileList ? this.$refs.inferiorSulcus.fileList.map(e=>e.url):[];
-    },
-    getboxBrandUrl(url) {
-      this.nodeInfo.boxBrand = this.$refs.boxBrand.fileList ? this.$refs.boxBrand.fileList.map(e=>e.url):[];
-    },
-    getLightningUrl(url) {
-      this.nodeInfo.lightning = this.$refs.Lightning.fileList ? this.$refs.Lightning.fileList.map(e=>e.url):[];
-    },
-    getGroundHardeningUrl(url) {
-      this.nodeInfo.groundHardening = this.$refs.GroundHardening.fileList ? this.$refs.GroundHardening.fileList.map(e=>e.url):[];
-    },
-    getBottomLegUrl(url) {
-      this.nodeInfo.bottomLeg = this.$refs.BottomLeg.fileList ? this.$refs.BottomLeg.fileList.map(e=>e.url):[];
-    },
-    getconstructionRecordsUrl(url) {
-      this.nodeInfo.constructionRecords = this.$refs.constructionRecords.fileList ? this.$refs.constructionRecords.fileList.map(e=>e.url):[];
+    getUrl1(url) {
+      this.nodeInfo.zEngiineeringPhotoBoListOne = this.$refs.obsImageUpload1.fileList ? this.$refs.obsImageUpload1.fileList.map(e=>e.url):[];
     },
-    getVideoUrl(url) {
-      this.nodeInfo.video = this.$refs.Video.fileList ? this.$refs.Video.fileList.map(e=>e.url):[];
+    getUrl2(url) {
+      this.nodeInfo.zEngiineeringPhotoBoListTwo = this.$refs.obsImageUpload2.fileList ? this.$refs.obsImageUpload2.fileList.map(e=>e.url):[];
     },
-    getonTheDitchUrl(url) {
-      this.nodeInfo.onTheDitch = this.$refs.onTheDitch.fileList ? this.$refs.onTheDitch.fileList.map(e=>e.url):[];
+    getUrl3(url) {
+      this.nodeInfo.zEngiineeringPhotoBoListThree = this.$refs.obsImageUpload3.fileList ? this.$refs.obsImageUpload3.fileList.map(e=>e.url):[];
     },
 
     // 获取材质规格

src/views/zdsz/engineeringIndustry/index.vue

@@ -253,10 +253,10 @@
             <el-form-item label="环节">
               <el-checkbox-group v-model="currentCheckList">
                 <el-checkbox
-                  :disabled=enginNodeStatusExecuted(item)
                   :label="item.dictValue"
                   v-for="item in nodeList"
                   :key="item"
+                  :disabled=enginNodeStatusExecuted(item)
                 ></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
@@ -700,16 +700,21 @@ export default {
         this.nodeList = res.data
       })
     },
-    // 新增顶管工程
     enginNodeStatusExecuted(item) {
       try {
-        if (this.currentCheckingEnginList.filter(e => e.label == item.dictValue)[0].status == '1') return true
+          // for (let i = 0; i < this.comprehensiveList.length; i++) {
+          //   if (this.comprehensiveList[i].nodeReViewStateList.state=='1'){
+          //     if (item.nodeReViewStateList[j].Type==this.nodeList[i].dictLabel){
+          //       console.log('123333333333333333333331')
+          //       return true;
+          //     }
+          //   }
+          // }
       } catch (error) {
         return false
       }
     },
     addNewPipe(data) {
-      // console.log(this.form)
       this.$refs.enginPipe.openDialog({
         id: data.id,
         type: this.form.type
@@ -866,6 +871,7 @@ export default {
             nodeCollection.push(nodeItem)
           })
           this.form.zEngineeringNodeBoList = nodeCollection
+          console.log(this.form.zEngineeringNodeBoList)
           if (this.title == '添加用料') {
             this.buttonLoading = true
             addEngineeEngineeIndustry(this.form).then(res => {