|
@@ -104,6 +104,16 @@
|
|
|
>导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:export']"
|
|
|
+ >批量审核
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
@@ -130,7 +140,7 @@
|
|
|
<dict-tag :options="dict.type.engin_cycle" :value="scope.row.enginCycle"/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="完工状态" align="center" prop="completionStatus"/>
|
|
|
+ <!-- <el-table-column label="完工状态" align="center" prop="completionStatus"/>-->
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -152,6 +162,22 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
+ @click="viewSource(scope.row)"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:remove']"
|
|
|
+ >审核
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-time"
|
|
|
+ @click="viewSource(scope.row)"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:remove']"
|
|
|
+ >历史用料
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="addNewPipe(scope.row)"
|
|
|
>新增顶管工程
|
|
@@ -175,7 +201,8 @@
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
<!-- 添加或修改民用工程对话框 -->
|
|
|
- <el-dialog :title="title" ref="nodeForm" :visible.sync="open" width="500" append-to-body custom-class="addDialog" @close="onClose">
|
|
|
+ <el-dialog :title="title" ref="nodeForm" :visible.sync="open" width="500" append-to-body custom-class="addDialog"
|
|
|
+ @close="onClose">
|
|
|
<el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
|
|
|
|
|
|
<el-row>
|
|
@@ -324,16 +351,16 @@
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="节点">
|
|
|
<el-checkbox-group v-model="currentCheckList">
|
|
|
- <el-checkbox
|
|
|
- :label="item.dictValue"
|
|
|
+ <el-checkbox
|
|
|
+ :label="item.dictValue"
|
|
|
v-for="item in checkList"
|
|
|
:key="item"
|
|
|
- ></el-checkbox>
|
|
|
+ ></el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <EnginNodeInfo
|
|
|
+ <EnginNodeInfo
|
|
|
v-for="(e,idx) in currentCheckList"
|
|
|
:key="idx"
|
|
|
:name="e"
|
|
@@ -356,6 +383,12 @@
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 查看历史 -->
|
|
|
+ <ConstructionDetails
|
|
|
+ ref="ConstructionDetails"
|
|
|
+ :currentCollapses="currentCollapses"
|
|
|
+ />
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -373,17 +406,18 @@ import {
|
|
|
putEngineeringCivil, // 民用工程修改
|
|
|
viewEngineeringCivil, // 民用工程查看详情
|
|
|
deleteEngineeringCivil, // 删除民用工程
|
|
|
- getDictList
|
|
|
+ getDictList, viewEngineeringInfrastructureSource, viewEngineeringCivilSource
|
|
|
} from "@/api/zdsz/enginee"
|
|
|
import {getAreaList} from "@/api/zdsz/area";
|
|
|
import {getBuildingList} from "@/api/zdsz/building";
|
|
|
import {getUnits} from "@/api/zdsz/unit";
|
|
|
-import {resetForm} from "@/utils/ruoyi";
|
|
|
import {getDicts} from "@/api/system/dict/data";
|
|
|
import EnginNodeInfo from "@/components/EnginNodeInfo/index";
|
|
|
+import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
+ ConstructionDetails,
|
|
|
EnginNodeInfo
|
|
|
},
|
|
|
|
|
@@ -403,189 +437,191 @@ export default {
|
|
|
"engin_cycle"],
|
|
|
data() {
|
|
|
return {
|
|
|
- updateOption:[],
|
|
|
- listContain:[
|
|
|
+ currentCollapses: [],
|
|
|
+ enginId: undefined,
|
|
|
+ updateOption: [],
|
|
|
+ listContain: [
|
|
|
{
|
|
|
- name:'放线',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '放线',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'挖沟',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '挖沟',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'焊接',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '焊接',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'下沟',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '下沟',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'回田',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'backfillTime', // 回填时间
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '回田',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'backfillTime', // 回填时间
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'打压',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'segmentedCompressionQualified', // 分段打压
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '打压',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'segmentedCompressionQualified', // 分段打压
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'除锈',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '除锈',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'刷油',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '刷油',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'打磨',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '打磨',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'打孔',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'corrosionLevel', // 孔径/腐蚀等级
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- ]
|
|
|
+ name: '打孔',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'corrosionLevel', // 孔径/腐蚀等级
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'立杠',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- ]
|
|
|
+ name: '立杠',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'挂表',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'brand', // 品牌
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '挂表',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'brand', // 品牌
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'表后管',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructAccordingDrawings', // 是否按图纸施工
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- ]
|
|
|
+ name: '表后管',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructAccordingDrawings', // 是否按图纸施工
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'阀管',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- 'visitType', // 上门类型
|
|
|
- 'selfClosingValveType', // 自闭阀类型
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- ]
|
|
|
+ name: '阀管',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ 'visitType', // 上门类型
|
|
|
+ 'selfClosingValveType', // 自闭阀类型
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ ]
|
|
|
},
|
|
|
],
|
|
|
- currentCheckList:[],
|
|
|
+ currentCheckList: [],
|
|
|
enginClassificationinfo: '',
|
|
|
enginClassification: '',
|
|
|
enginClassificationOption: [],
|
|
@@ -628,7 +664,6 @@ export default {
|
|
|
unitId: undefined,
|
|
|
houseId: undefined,
|
|
|
enginType: undefined,
|
|
|
- enginClassification: undefined,
|
|
|
enginCycle: undefined,
|
|
|
completionStatus: undefined,
|
|
|
enginClassification: undefined,
|
|
@@ -737,7 +772,7 @@ export default {
|
|
|
houseOptions: [], // 房间集合
|
|
|
enginClassification_list: [], // 室内节点,
|
|
|
checkList: [],// 节点集合
|
|
|
- enginNodeStatus:null
|
|
|
+ enginNodeStatus: null
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -745,12 +780,44 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
},
|
|
|
- computed:{
|
|
|
- currentContain(e){
|
|
|
- console.log('当前contain',e)
|
|
|
+ computed: {
|
|
|
+ currentContain(e) {
|
|
|
+ console.log('当前contain', e)
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ viewNodeSource(e) {
|
|
|
+ viewEngineeringCivilSource({
|
|
|
+ id: this.enginId,
|
|
|
+ type: e
|
|
|
+ }).then(res => {
|
|
|
+ try {
|
|
|
+ this.currentCollapses = res.data.zEngineeringNodeBo.zEngineeringInfoBoList
|
|
|
+ } catch (error) {
|
|
|
+ this.currentCollapses = [];
|
|
|
+ }
|
|
|
+ console.log('折叠面板info',this.currentCollapses)
|
|
|
+ })
|
|
|
+ this.$forceUpdate()
|
|
|
+ },
|
|
|
+ // 查看历史
|
|
|
+ viewSource(e) {
|
|
|
+ console.log(e)
|
|
|
+ this.enginId = e.id
|
|
|
+ let val = e.enginType + "_" + e.enginClassification
|
|
|
+ getDicts(val).then(res => {
|
|
|
+ let dict = []
|
|
|
+ for (let i = 0; i < res.data.length; i++) {
|
|
|
+ dict.push({
|
|
|
+ "label": res.data[i].dictLabel,
|
|
|
+ "value": res.data[i].dictValue,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.$refs.ConstructionDetails.open(dict)
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
// 新增顶管工程
|
|
|
addNewPipe(data) {
|
|
|
this.$refs.enginPipe.openDialog({
|
|
@@ -759,7 +826,7 @@ export default {
|
|
|
}, 'add')
|
|
|
},
|
|
|
// 新增物料
|
|
|
- addMaterial(data){
|
|
|
+ addMaterial(data) {
|
|
|
this.title = "添加用料";
|
|
|
// this.enginNodeStatus = '修改'
|
|
|
this.loading = true;
|
|
@@ -771,7 +838,7 @@ export default {
|
|
|
// 手动调用行政区发生改变
|
|
|
this.districtHasChanged(newData.district)
|
|
|
this.communityHasChanged(newData.areaId)
|
|
|
- this.buildingHasChanged(newData.buildingId,newData.areaId)
|
|
|
+ this.buildingHasChanged(newData.buildingId, newData.areaId)
|
|
|
this.unitHasChanged(newData.unitId)
|
|
|
// 获取工程分类
|
|
|
this.enginTypeHasChanged(newData.enginType)
|
|
@@ -780,10 +847,10 @@ export default {
|
|
|
getDicts(val).then(res => {
|
|
|
this.checkList = res.data
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
this.queryParams = newData
|
|
|
console.log(this.queryParams.areaId)
|
|
|
-
|
|
|
+
|
|
|
// console.log('选中节点集合',this.currentCheckList)
|
|
|
// this.enginClassification = zEngineeringNodeBo.type
|
|
|
// newData.zEngineeringNodeBo = zEngineeringNodeBo
|
|
@@ -820,10 +887,10 @@ export default {
|
|
|
this.buildingOptions = res.data
|
|
|
})
|
|
|
},
|
|
|
- buildingHasChanged(buildingId,areaId) {
|
|
|
+ buildingHasChanged(buildingId, areaId) {
|
|
|
console.log(buildingId)
|
|
|
this.queryParams.unitId = null
|
|
|
- getUnits(areaId || this.queryParams.areaId,buildingId ).then(res => {
|
|
|
+ getUnits(areaId || this.queryParams.areaId, buildingId).then(res => {
|
|
|
this.unitOptions = res.data
|
|
|
})
|
|
|
},
|
|
@@ -841,10 +908,10 @@ export default {
|
|
|
this.currentEnginTypeChangeOptions = res.data
|
|
|
})
|
|
|
},
|
|
|
- onClose(){
|
|
|
+ onClose() {
|
|
|
console.log(this.currentCheckList)
|
|
|
this.currentCheckList = []
|
|
|
- this.checkList =[]
|
|
|
+ this.checkList = []
|
|
|
this.$refs.nodeForm.resetFields()
|
|
|
},
|
|
|
closeToSucceed() {
|
|
@@ -962,40 +1029,40 @@ export default {
|
|
|
toNodeDetail() {
|
|
|
let nodeCollection = []
|
|
|
// 收集节点信息
|
|
|
- this.currentCheckList.forEach((e,idx) => {
|
|
|
- let nodeItem = this.$refs['EnginNodeInfo'+ idx][0].infoCollection()
|
|
|
+ this.currentCheckList.forEach((e, idx) => {
|
|
|
+ let nodeItem = this.$refs['EnginNodeInfo' + idx][0].infoCollection()
|
|
|
// console.log(nodeItem)
|
|
|
- nodeCollection.push(nodeItem)
|
|
|
+ nodeCollection.push(nodeItem)
|
|
|
})
|
|
|
this.queryParams.zEngineeringNodeBoList = nodeCollection
|
|
|
- if(this.enginNodeStatus == '修改'){
|
|
|
+ if (this.enginNodeStatus == '修改') {
|
|
|
putEngineeringCivil(this.queryParams).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '修改成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.open = false
|
|
|
- console.log('选中节点集合',this.currentCheckList)
|
|
|
+ console.log('选中节点集合', this.currentCheckList)
|
|
|
this.currentCheckList = []
|
|
|
// this.$emit('closeToSucceed')
|
|
|
}
|
|
|
})
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
addEngineeringCivil(this.queryParams).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '新增成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.open = false
|
|
|
- console.log('选中节点集合',this.currentCheckList)
|
|
|
+ console.log('选中节点集合', this.currentCheckList)
|
|
|
this.currentCheckList = []
|
|
|
// this.$emit('closeToSucceed')
|
|
|
}
|
|
|
- })
|
|
|
+ })
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return
|
|
|
getDictList({enginType: ['new_built', 'old_renovation']}).then(res => {
|
|
|
this.nodeList = res.data
|
|
@@ -1045,11 +1112,10 @@ export default {
|
|
|
this.updateOption = res.data.zEngineeringNodeBoList
|
|
|
console.log(this.queryParams.areaId)
|
|
|
// start update修改数据
|
|
|
- res.data.zEngineeringNodeBoList.forEach((e,idx) => {
|
|
|
+ res.data.zEngineeringNodeBoList.forEach((e, idx) => {
|
|
|
this.currentCheckList.push(e.type)
|
|
|
})
|
|
|
-
|
|
|
- console.log('选中节点集合',this.currentCheckList)
|
|
|
+ console.log('选中节点集合', this.currentCheckList)
|
|
|
// end
|
|
|
let zEngineeringNodeBo = {
|
|
|
type: res.data.zEngineeringNodeBoList[0].type,
|
|
@@ -1133,9 +1199,10 @@ export default {
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
|
|
|
-::v-deep .addDialog{
|
|
|
+::v-deep .addDialog {
|
|
|
width: 60%;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .appendElDialog {
|
|
|
width: 70%;
|
|
|
height: 80%;
|