|
|
@@ -262,9 +262,9 @@
|
|
|
<span
|
|
|
style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
|
|
|
<span
|
|
|
- style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>底腿未完工
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>暂存
|
|
|
<span
|
|
|
- style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>前后照片一致
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>前后照片不一致
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
plain
|
|
|
@@ -278,6 +278,110 @@
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
+
|
|
|
+ <el-table :data="zuijinList">
|
|
|
+ <el-table-column type="selection" width="55" align="center"/>
|
|
|
+ <el-table-column label="主键" align="center" prop="id" v-if="false"/>
|
|
|
+ <el-table-column label="行政区" align="center" prop="district">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.district" :value="scope.row.district"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="小区名称" align="center" prop="areaName"/>
|
|
|
+ <el-table-column label="楼宇名称" align="center" prop="buildingName"/>
|
|
|
+ <el-table-column label="单元名称" align="center" prop="unitName"/>
|
|
|
+ <el-table-column label="房间名称" align="center" prop="houseName"/>
|
|
|
+ <el-table-column label="工程类型" align="center" prop="enginType">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.enginType === 'old_renovation' ? "旧改工程" : "新建" }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="工程分类" align="center" prop="enginClassificationName"/>
|
|
|
+ <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.content=='无数据' && item.Type != '开栓'"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #c0c0c0;"></span>
|
|
|
+ <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核' && item.Type != '开栓'"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
|
|
|
+ <span slot="reference" v-if="(item.state == '1'||item.state == '2') && item.Type != '开栓' "
|
|
|
+ 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 == '99' && item.Type != '开栓'"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>
|
|
|
+ <span slot="reference" v-if="item.state == '0' && item.content!='暂未审核' && item.Type != '开栓'"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
|
|
|
+ <span slot="reference" v-if="item.state == '3' && item.Type != '开栓'"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>
|
|
|
+
|
|
|
+ <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #ffff00;"></span>
|
|
|
+ <span slot="reference" v-if="item.state == '1' && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
|
|
|
+ style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #6998e0;"></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
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-edit"
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:edit']"
|
|
|
+ >修改工程信息
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-edit"
|
|
|
+ @click="addNodeInfo(scope.row)"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:xgsg']"
|
|
|
+ >修改施工信息
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
+ @click="viewSource(scope.row,'check')"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:review']"
|
|
|
+ >审核
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-time"
|
|
|
+ @click="viewSource(scope.row)"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:lssg']"
|
|
|
+ >历史施工
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-edit"
|
|
|
+ v-hasPermi="['zdsz:engineeringPipeJacking:xzdggc']"
|
|
|
+ @click="addNewPipe(scope.row)"
|
|
|
+ >新增顶管工程
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-edit"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:tjyl']"
|
|
|
+ @click="addMaterial(scope.row)"
|
|
|
+ >添加用料
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+
|
|
|
<el-table v-loading="loading" :data="engineeringCivilList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
<el-table-column label="主键" align="center" prop="id" v-if="false"/>
|
|
|
@@ -934,6 +1038,8 @@ export default {
|
|
|
"engin_cycle"],
|
|
|
data() {
|
|
|
return {
|
|
|
+ zuijinList:[],
|
|
|
+ listone:null,
|
|
|
nodeDetailType: null,
|
|
|
enginClassification: null,
|
|
|
currentCollapses: [],
|
|
|
@@ -1355,7 +1461,7 @@ export default {
|
|
|
label: '未审核'
|
|
|
},{
|
|
|
value: '3',
|
|
|
- label: '照片一致'
|
|
|
+ label: '照片不一致'
|
|
|
},{
|
|
|
value: '99',
|
|
|
label: '无数据'
|
|
|
@@ -1667,16 +1773,31 @@ export default {
|
|
|
// 节点单项审核
|
|
|
checkWorking(checkingInfo) {
|
|
|
let params = checkingInfo
|
|
|
- params.createTime = this.createTime
|
|
|
+ let that = this;
|
|
|
+ params.createTime = that.createTime
|
|
|
CivilReview(params).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '审核成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
- this.getList()
|
|
|
+ if(that.zuijinList.length > 2){
|
|
|
+ that.zuijinList.shift();
|
|
|
+ }
|
|
|
+ for (const i in that.zuijinList) {
|
|
|
+ if(that.zuijinList[i].id == that.listone.id){
|
|
|
+ that.zuijinList.splice(i, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (const i in that.listone.nodeReViewStateList) {
|
|
|
+ if(that.listone.nodeReViewStateList[i].Type == checkingInfo.activeNames){
|
|
|
+ that.listone.nodeReViewStateList[i].state = checkingInfo.reviewStatus
|
|
|
+ }
|
|
|
+ }
|
|
|
+ that.zuijinList.push(that.listone);
|
|
|
+ that.getList();
|
|
|
setTimeout(() => {
|
|
|
- this.viewNodeSource()
|
|
|
+ that.viewNodeSource()
|
|
|
}, 1000)
|
|
|
}
|
|
|
})
|
|
|
@@ -1742,6 +1863,7 @@ export default {
|
|
|
},
|
|
|
// 查看历史
|
|
|
viewSource(e, type = null) {
|
|
|
+ this.listone = e;
|
|
|
this.enginClassification = e.enginClassification
|
|
|
console.log("viewSource(e, type = null)", e)
|
|
|
let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
|
|
|
@@ -2267,8 +2389,9 @@ export default {
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
exportBottomLeg() {
|
|
|
- if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
|
|
|
- this.$message.warning("请选择行政区")
|
|
|
+ if ((this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '')&&
|
|
|
+ (this.queryParams1.areaId == undefined || this.queryParams1.areaId == null || this.queryParams1.areaId == '')) {
|
|
|
+ this.$message.warning("请选择行政区或小区")
|
|
|
return
|
|
|
}
|
|
|
this.download('zdsz/engineeringCivil/exportBottomLeg', {
|
|
|
@@ -2287,10 +2410,11 @@ export default {
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- // if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
|
|
|
- // this.$message.warning("请选择行政区")
|
|
|
- // return
|
|
|
- // }
|
|
|
+ if ((this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '')&&
|
|
|
+ (this.queryParams1.areaId == undefined || this.queryParams1.areaId == null || this.queryParams1.areaId == '')) {
|
|
|
+ this.$message.warning("请选择行政区或小区")
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '') {
|
|
|
this.$message.warning("请选择工程类型")
|
|
|
return
|
