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

src/api/zdsz/enginee.js

@@ -208,6 +208,13 @@ export function CivilReview(data) {
     data
   })
 }
+export function insertReview(data) {
+  return request({
+    url: '/zdsz/engineeringCivil/insertReview',
+    method: 'post',
+    data
+  })
+}
 
 
 // 民用批量审核

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -52,6 +52,22 @@
       <el-table-column label="工程规模" align="center" prop="enginScale" />
       <el-table-column label="施工质量" align="center" prop="constructQuality" />
       <el-table-column label="施工进度" align="center" prop="constructSchedule" />
+      <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" prop="remark" show-overflow-tooltip/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
         <template slot-scope="scope">
@@ -61,14 +77,14 @@
             size="mini"
             @click="viewSource(scope.row)"
           >历史</el-button> -->
-          <!-- <el-button
+           <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
             @click="viewSource(scope.row,'check')"
             v-hasPermi="['zdsz:engineeringCivil:remove']"
           >审核
-          </el-button> -->
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -290,7 +306,7 @@ import {
   detailEngineeringPipeJacking,              // 历史
   getDictList,
   engineeringCivilReview,
-  putEngineeringPipeJacking
+  putEngineeringPipeJacking, CivilReview, insertReview
 } from "@/api/zdsz/enginee"
 import {getDicts} from "@/api/system/dict/data";
 
@@ -514,13 +530,15 @@ export default {
     checkWorking(checkingInfo){
       let params = checkingInfo
       params.createTime = this.createTime
-      params.engInfoId = this.currentId
-      engineeringCivilReview(params).then(res => {
+      // params.engInfoId = this.currentId
+      insertReview(params).then(res => {
         if(res.code == 200){
           this.$message({
             message: '审核成功',
             type: 'success'
           });
+          this.$refs.ConstructionDetails.dialogVisible = false
+          this.getList()
         }
       })
     },
@@ -585,7 +603,7 @@ export default {
       this.currentId = e.id
       this.status = 'read-only'
       console.log('__________',r)
-      this.$refs.ConstructionDetails.open(r,_,type)
+      this.$refs.ConstructionDetails.open(r,_,type,e,e.type)
     },
     viewNodeSource(e){
       console.log('查看历史传值',e,this.currentId)
@@ -598,6 +616,7 @@ export default {
         try {
           this.updateParams = res.data
           this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
+          this.$refs.ConstructionDetails.setEngineId(res.data.zEngineeringNodeBo.id || null)
         } catch (error) {
           this.currentCollapses = [];
         }