202406市政，回填撤场 下载照片修改

src/components/ConstructionDetails/indexSZ.vue

@@ -435,7 +435,7 @@ export default {
             this.checkingInfo.engInfoId = this.currentEnginId
             this.checkingInfo.delInfoIdList = this.delinfoidList
             this.checkingInfo.infoIdList = this.infoIdList
-            this.$emit('checkWorking', this.checkingInfo)
+            this.$emit('checkWorking', this.checkingInfo,this.activeNames=='回填、撤场'?1:0)
             this.checkList = []
           } catch (error) {
             this.checkingInfo.engInfoId = null

src/components/EnginNodeInfo/indexSZ.vue

@@ -268,11 +268,11 @@ export default {
           })
           this.nodeInfoBo.type = this.name
           // 接口数据格式修改 图片和用料放到nodeInfoBo节点详情对象中
-          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 = []
@@ -283,6 +283,7 @@ export default {
           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
           // delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
           result = this.nodeInfoBo

src/views/zdsz/engineeringIndustry/index.vue

@@ -557,9 +557,28 @@ export default {
       this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/${'市政工程'}/${name}`, name);
     },
     // 节点审核
-    checkWorking(checkingInfo) {
+    checkWorking(checkingInfo,flag) {
       let params = checkingInfo
       params.createTime = this.createTime
+      if (flag === 1){
+        params.infoIdList.forEach(item=>{
+          if (item.zEngiineeringPhotoBoListOne.length>0){
+            item.zEngiineeringPhotoBoListOne.forEach(o=>{
+              item.zEngiineeringPhotoBoList.push(o)
+            })
+          }
+          if (item.zEngiineeringPhotoBoListTwo.length>0){
+            item.zEngiineeringPhotoBoListTwo.forEach(o=>{
+              item.zEngiineeringPhotoBoList.push(o)
+            })
+          }
+          if (item.zEngiineeringPhotoBoListThree.length>0){
+            item.zEngiineeringPhotoBoListThree.forEach(o=>{
+              item.zEngiineeringPhotoBoList.push(o)
+            })
+          }
+        })
+      }
       console.log('节点审核 checkingInfo===', params)
       insertReview(params).then(res => {
         if (res.code == 200) {
@@ -783,7 +802,7 @@ export default {
     getUrl(url) {
       this.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
     },
-    /** 查询市政工程|工业工程列表 */
+    /** 查询市政工程 */
     getList(val) {
       this.loading = true;
       getEngineeIndustryList(this.searchParams).then(res => {
@@ -832,13 +851,11 @@ export default {
     handleAdd() {
       this.reset();
       this.gc = true
-      this.title = (this.form.type === '1' ? "新增工业工程" : "新增市政工程");
+      this.title = "新增市政工程";
       this.currentType = 'add'
       this.open = true;
     },
     removeFile(val) {
-      console.log(val)
-      console.log("我是文件")
       this.form.files = val
     },
     /** 修改按钮操作 */