|
@@ -188,6 +188,20 @@
|
|
|
<!-- </template>-->
|
|
|
<!-- </el-table-column>-->
|
|
|
<!-- <el-table-column label="完工状态" align="center" prop="completionStatus"/>-->
|
|
|
+ <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 == '0'" 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 == '1'" 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="300">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -871,7 +885,7 @@ export default {
|
|
|
'constructTime',
|
|
|
'zEngiineeringPhotoBoList', // 照片
|
|
|
]
|
|
|
- },{
|
|
|
+ }, {
|
|
|
name: '底腿下沟',
|
|
|
components: [
|
|
|
[
|
|
@@ -880,7 +894,7 @@ export default {
|
|
|
'constructTime',
|
|
|
'zEngiineeringPhotoBoList', // 照片
|
|
|
]
|
|
|
- },{
|
|
|
+ }, {
|
|
|
name: '底腿回填',
|
|
|
components: [
|
|
|
[
|
|
@@ -893,8 +907,7 @@ export default {
|
|
|
{
|
|
|
name: '管道施工记录',
|
|
|
components: [
|
|
|
- [
|
|
|
- ],
|
|
|
+ [],
|
|
|
'constructTime',
|
|
|
'zEngiineeringPhotoBoList', // 照片
|
|
|
]
|
|
@@ -915,7 +928,7 @@ export default {
|
|
|
],
|
|
|
currentEnginTypeChangeOptions: [],
|
|
|
currentEnginTypeChangeOptions1: [],
|
|
|
- currentEnginTypeChangeOptions2:[],
|
|
|
+ currentEnginTypeChangeOptions2: [],
|
|
|
|
|
|
// 按钮loading
|
|
|
buttonLoading: false,
|
|
@@ -981,7 +994,7 @@ export default {
|
|
|
enginCycle: 0,
|
|
|
completionStatus: undefined,
|
|
|
imgUrl: undefined,
|
|
|
- type:undefined
|
|
|
+ type: undefined
|
|
|
},
|
|
|
zEngineeringInfoBo: {
|
|
|
constructAddre: '', // 施工地址
|
|
@@ -1172,7 +1185,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
addNodeInfo(e) {
|
|
|
- console.log('e',11111)
|
|
|
+ console.log('e', 11111)
|
|
|
this.nodeDetailType = '修改'
|
|
|
this.enginId = e.id
|
|
|
this.status = 'put'
|
|
@@ -1193,7 +1206,7 @@ export default {
|
|
|
if (e) {
|
|
|
this.currentEnginName = e
|
|
|
}
|
|
|
- console.log('viewNodeSource',this.currentEnginName)
|
|
|
+ console.log('viewNodeSource', this.currentEnginName)
|
|
|
viewEngineeringCivilSource({
|
|
|
id: this.enginId,
|
|
|
type: e || this.currentEnginName
|
|
@@ -1363,13 +1376,13 @@ export default {
|
|
|
this.currentEnginTypeChangeOptions1 = res.data
|
|
|
})
|
|
|
},
|
|
|
- nodeTypeHasChangeds(enginType = null,enginClassification = null) {
|
|
|
- if ((this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '')&&(this.queryParams1.enginClassification == undefined || this.queryParams1.enginClassification == null || this.queryParams1.enginClassification == ''))
|
|
|
+ nodeTypeHasChangeds(enginType = null, enginClassification = null) {
|
|
|
+ if ((this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '') && (this.queryParams1.enginClassification == undefined || this.queryParams1.enginClassification == null || this.queryParams1.enginClassification == ''))
|
|
|
return
|
|
|
this.currentCheckList = []
|
|
|
this.queryParams1.type = ''
|
|
|
this.currentEnginTypeChangeOptions2 = []
|
|
|
- getDicts(enginType&&enginClassification || this.queryParams1.enginType+'_'+this.queryParams1.enginClassification).then(res => {
|
|
|
+ getDicts(enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification).then(res => {
|
|
|
this.currentEnginTypeChangeOptions2 = res.data
|
|
|
})
|
|
|
},
|