qinhouyu 1 anno fa
parent
commit
fbdbe98136

+ 21 - 6
src/views/zdsz/engineeringAirWall/index.vue

@@ -85,6 +85,22 @@
           <span>{{ parseDict(scope.row.enginType, 'air_wall_node') }}</span>
         </template>
       </el-table-column>
+      <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="enginClassification"/>-->
       <!--<el-table-column label="现场负责人" align="center" prop="sceneHead"/>-->
       <!--<el-table-column label="设计负责人" align="center" prop="designHead"/>-->
@@ -347,7 +363,7 @@ import {getDicts} from "@/api/system/dict/data";
 import EngineePipe from '@/components/EngineePipe'
 import {validPhoneMobile} from '@/api/rules'
 import ConstructionDetails from '@/components/ConstructionDetails/index.vue'
-import {getEnginMaterialQualityList , engineeringCivilReview} from '@/api/zdsz/enginee'
+import {getEnginMaterialQualityList, engineeringCivilReview, insertReview} from '@/api/zdsz/enginee'
 import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
@@ -522,15 +538,14 @@ export default {
       console.log('checkingInfo===',checkingInfo)
       let params = checkingInfo
       params.createTime = this.createTime
-      engineeringCivilReview(params).then(res => {
-        if(res.code == 200){
+      insertReview(params).then(res => {
+        if (res.code == 200) {
           this.$message({
             message: '审核成功',
             type: 'success'
           });
-          setTimeout(() => {
-            this.viewNodeSource()
-          },1000)
+          this.$refs.ConstructionDetails.dialogVisible = false
+          this.getList()
         }
       })
     },

+ 21 - 6
src/views/zdsz/engineeringIndustry/index.vue

@@ -87,6 +87,22 @@
       <el-table-column label="设计负责人" align="center" prop="designHead"/>
       <el-table-column label="监理负责人" align="center" prop="supervisionHead"/>
       <el-table-column label="监理单位" align="center" prop="supervisionUnit"/>
+      <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">
         <template v-slot="scope">
           <el-button
@@ -343,7 +359,7 @@ import {getDicts} from "@/api/system/dict/data";
 import EngineePipe from '@/components/EngineePipe'
 import {validPhoneMobile} from '@/api/rules'
 import ConstructionDetails from '@/components/ConstructionDetails/index.vue'
-import {getEnginMaterialQualityList, engineeringCivilReview} from '@/api/zdsz/enginee'
+import {getEnginMaterialQualityList, engineeringCivilReview, insertReview} from '@/api/zdsz/enginee'
 import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
@@ -514,15 +530,14 @@ export default {
       console.log('checkingInfo===',checkingInfo)
       let params = checkingInfo
       params.createTime = this.createTime
-      engineeringCivilReview(params).then(res => {
-        if(res.code == 200){
+      insertReview(params).then(res => {
+        if (res.code == 200) {
           this.$message({
             message: '审核成功',
             type: 'success'
           });
-          setTimeout(() => {
-            this.viewNodeSource()
-          },1000)
+          this.$refs.ConstructionDetails.dialogVisible = false
+          this.getList()
         }
       })
     },