提交代码

src/components/ConstructionDetails/index.vue

@@ -1243,9 +1243,9 @@ export default {
         console.log(4)
         console.log(dicts)
         this.dialogVisible = true
-        if (kind=='基建'){
-          dicts=dicts.filter(item=>['水电施工','防水'].includes(item.value))
-        }
+        // if (kind=='基建'){
+        //   dicts=dicts.filter(item=>['水电施工','防水'].includes(item.value))
+        // }
         this.currentDicts = dicts
       }
       // alert(enginType)

src/views/zdsz/engineeringDangerous/index.vue

@@ -154,13 +154,13 @@
           <!--            @click="addNewPipe(scope.row)"-->
           <!--          >新增顶管工程-->
           <!--          </el-button>-->
-          <!--          <el-button
-                      type="text"
-                      icon="el-icon-edit"
-                      size="mini"
-                      @click="viewSource(scope.row)"
-                    >历史
-                    </el-button>-->
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="mini"
+            @click="viewSource(scope.row)"
+          >历史
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -401,13 +401,15 @@
           <el-col :span="24">
             <el-form-item label="附件" prop="files" v-if="form.id">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
+                             :limit="9999"
                              :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
             <el-form-item label="附件" prop="files" v-else>
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
+                             :limit="9999"
                              :value="form.files"
               ></ObsFileUpload>
             </el-form-item>
@@ -419,7 +421,9 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="titleInfo"  :visible.sync="openInfo" append-to-body customClass="appendElDialog">
 
+    </el-dialog>
   </div>
 </template>
 
@@ -448,6 +452,8 @@ export default {
       //备用
       currentCollapses: [],
       nodeType: "危险作业工程",
+      titleInfo: "危险作业工程",
+      openInfo: false,
       nodeDetailVisible: false,
       // 按钮loading
       buttonLoading: false,
@@ -627,8 +633,9 @@ export default {
 
     //备用
     viewSource(e) {
-      this.currentId = e.id
-      this.$refs.ConstructionDetails.open(_, "危险作业工程",null,null,null,null,null,"危险作业工程")
+      console.log(e)
+      this.openInfo = true
+      this.titleInfo = "危险作业工程 - " + e.enginName
     },
     viewNodeSource(e) {
       // todo: 获取数据

src/views/zdsz/engineeringIndustry/index.vue

@@ -542,7 +542,7 @@ export default {
   methods: {
     download(name){
       // downloadZipForSZ(this.form.type=='1'?'工业工程':'市政工程',name)
-        this.$download.zip(`/zdsz/engineeringIndustry/downloadZip/${this.form.type=='1'?'工业工程':'市政工程'}/${name}`, name);
+        this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/${this.form.type=='1'?'工业工程':'市政工程'}/${name}`, name);
     },
     changName(val) {
       if (this.form.type == '1')

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -64,6 +64,22 @@
       <el-table-column label="建设单位" align="center" prop="constructUnit" />
       <el-table-column label="开工时间" align="center" prop="startTime" />
       <el-table-column label="施工内容" align="center" prop="enginContent" show-overflow-tooltip/>
+      <el-table-column label="审核状态" align="center" prop="nodeReViewStateList" width="250">
+        <template slot-scope="scope">
+          <div style="text-align:center">
+            <el-popover
+              v-for="item in scope.row.nodeReViewStateList"
+              placement="top-start"
+              trigger="hover"
+              :content="item.Type">
+              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
+              <span slot="reference" v-if="item.state == '0' "
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="400">
         <template slot-scope="scope">
             <el-button
@@ -120,6 +136,12 @@
             @click="addMaterial(scope.row)"
           >添加用料
           </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-download"
+            size="mini"
+            @click="download(scope.row.enginName)"
+          >下载图片</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -238,7 +260,7 @@
 
 <script>
 import { listComprehensive, getComprehensive, delComprehensive, addComprehensive, updateComprehensive} from "@/api/zdsz/comprehensive";
-import { viewEngineeringInfrastructureSource } from "@/api/zdsz/enginee"
+import {downloadZip, insertReview, viewEngineeringInfrastructureSource} from "@/api/zdsz/enginee"
 import {getBuildings} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
 import {getAreas} from "@/api/zdsz/area";
@@ -708,6 +730,10 @@ export default {
     this.checkList = this.dict.type.engineering_infrastructure
   },
   methods: {
+    download(name){
+      // downloadZip('基建工程',name)
+      this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/基建工程/${name}`, name);
+    },
     enginNodeStatusExecuted(item){
       try {
         let flag
@@ -721,7 +747,7 @@ export default {
      console.log('checkingInfo===',checkingInfo)
     let params = checkingInfo
     params.createTime = this.createTime
-    engineeringCivilReview(params).then(res => {
+    insertReview(params).then(res => {
       if(res.code == 200){
         this.$message({
           message: '审核成功',
@@ -729,6 +755,7 @@ export default {
         });
         setTimeout(() => {
           this.viewNodeSource()
+          this.getList()
         },1000)
       }
     })
@@ -786,11 +813,9 @@ export default {
       // 审核
       let checkingParams = []
       getDictList({enginType:['engineering_infrastructure']}).then(res => {
-        checkingParams = res.data.filter(e => {
-          return e.label == '水电施工' || e.label == '防水'
-        })
+        checkingParams = res.data
         setTimeout(() => {
-          console.log('___',checkingParams)
+          console.log('___checkingParams',checkingParams)
           this.zEngineeringNodeBo = e
           this.currentId = e.id
           this.status = 'read-only'

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -516,7 +516,7 @@ export default {
   },
   methods: {
     download(name){
-      downloadZip('顶管工程',name)
+      this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/顶管工程/${name}`, name);
     },
     // 填写节点信息
     updateNodeOption(zEngineeringInfoBoList) {