|
@@ -34,6 +34,41 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="工程类型" prop="enginType">
|
|
|
|
+ <el-select v-model="queryParams.enginType" placeholder="请选择工程类型" clearable
|
|
|
|
+ @change="enginTypeHasChangeds"
|
|
|
|
+ @clear="currentEnginTypeChangeOptions1=[];queryParams.enginClassification=undefined;queryParams.enginType=undefined">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in enginTypeOption"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.label"
|
|
|
|
+ :value="dict.value"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="工程分类" prop="enginClassification">
|
|
|
|
+ <el-select v-model="queryParams.enginClassification" placeholder="请选择工程分类" clearable
|
|
|
|
+ @change="nodeTypeHasChangeds"
|
|
|
|
+ @clear="currentEnginTypeChangeOptions1=[];queryParams.enginClassification=undefined;queryParams.enginType=undefined">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in currentEnginTypeChangeOptions1"
|
|
|
|
+ :key="dict.dictValue"
|
|
|
|
+ :label="dict.dictLabel"
|
|
|
|
+ :value="dict.dictValue"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="节点类型" prop="enginClassification">
|
|
|
|
+ <el-select v-model="queryParams.nodeType" placeholder="请选择节点类型" clearable
|
|
|
|
+ @clear="currentEnginTypeChangeOptions2=[];queryParams.enginClassification=undefined;queryParams.enginType=undefined;queryParams.nodeType=undefined">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in currentEnginTypeChangeOptions2"
|
|
|
|
+ :key="dict.dictValue"
|
|
|
|
+ :label="dict.dictLabel"
|
|
|
|
+ :value="dict.dictValue"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="材质" prop="realityQuality" label-width="45px">
|
|
<el-form-item label="材质" prop="realityQuality" label-width="45px">
|
|
<el-select v-model="queryParams.realityQuality" placeholder="请选择材质" filterable clearable
|
|
<el-select v-model="queryParams.realityQuality" placeholder="请选择材质" filterable clearable
|
|
@change="queryParams.realityQuality != undefined;getEnginSpecificationsList(queryParams.realityQuality)"
|
|
@change="queryParams.realityQuality != undefined;getEnginSpecificationsList(queryParams.realityQuality)"
|
|
@@ -116,7 +151,7 @@
|
|
<el-table
|
|
<el-table
|
|
class="materialStatisticsTable"
|
|
class="materialStatisticsTable"
|
|
:data="tableData"
|
|
:data="tableData"
|
|
-
|
|
|
|
|
|
+ show-summary
|
|
style="width: 100%">
|
|
style="width: 100%">
|
|
<el-table-column
|
|
<el-table-column
|
|
prop="areaName"
|
|
prop="areaName"
|
|
@@ -124,6 +159,18 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ prop="enginType"
|
|
|
|
+ label="工程类型">
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ prop="enginClassification"
|
|
|
|
+ label="工程分类">
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ prop="nodeType"
|
|
|
|
+ label="节点类型">
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
prop="materialQuality"
|
|
prop="materialQuality"
|
|
label="材质"
|
|
label="材质"
|
|
>
|
|
>
|
|
@@ -141,10 +188,7 @@
|
|
prop="realitySize"
|
|
prop="realitySize"
|
|
label="实际用料">
|
|
label="实际用料">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
-<!-- <el-table-column-->
|
|
|
|
-<!-- prop="enginCycle"-->
|
|
|
|
-<!-- label="工程周期">-->
|
|
|
|
-<!-- </el-table-column>-->
|
|
|
|
|
|
+
|
|
</el-table>
|
|
</el-table>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
@@ -164,12 +208,15 @@ import {
|
|
materialStatistics // 获取当前单元集合
|
|
materialStatistics // 获取当前单元集合
|
|
} from '@/api/zdsz/overhead'
|
|
} from '@/api/zdsz/overhead'
|
|
import {getUnits} from "@/api/zdsz/unit";
|
|
import {getUnits} from "@/api/zdsz/unit";
|
|
|
|
+import {getDicts} from "@/api/system/dict/data";
|
|
export default {
|
|
export default {
|
|
|
|
|
|
name:'MaterialStatistics',
|
|
name:'MaterialStatistics',
|
|
dicts:['district','engin_cycle'],
|
|
dicts:['district','engin_cycle'],
|
|
data(){
|
|
data(){
|
|
return {
|
|
return {
|
|
|
|
+ currentEnginTypeChangeOptions1: [],
|
|
|
|
+ currentEnginTypeChangeOptions2: [],
|
|
buildingList: [],
|
|
buildingList: [],
|
|
areaList:[],
|
|
areaList:[],
|
|
unitList: [],
|
|
unitList: [],
|
|
@@ -239,6 +286,9 @@ export default {
|
|
areaId:undefined,
|
|
areaId:undefined,
|
|
realityQuality:undefined,
|
|
realityQuality:undefined,
|
|
realitySpecifications:undefined,
|
|
realitySpecifications:undefined,
|
|
|
|
+ enginClassification:undefined,
|
|
|
|
+ enginType:undefined,
|
|
|
|
+ nodeType:undefined,
|
|
enginCycle:0
|
|
enginCycle:0
|
|
},
|
|
},
|
|
EnginMaterialQualityList:[],
|
|
EnginMaterialQualityList:[],
|
|
@@ -251,7 +301,16 @@ export default {
|
|
areaId: [
|
|
areaId: [
|
|
{required: true, message: "小区不能为空", trigger: ['change']}
|
|
{required: true, message: "小区不能为空", trigger: ['change']}
|
|
],
|
|
],
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ enginTypeOption: [
|
|
|
|
+ {
|
|
|
|
+ value: 'old_renovation',
|
|
|
|
+ label: '旧改'
|
|
|
|
+ }, {
|
|
|
|
+ value: 'new_built',
|
|
|
|
+ label: '新建'
|
|
|
|
+ },
|
|
|
|
+ ]
|
|
|
|
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -261,6 +320,34 @@ export default {
|
|
//this.getEnginSpecificationsList()
|
|
//this.getEnginSpecificationsList()
|
|
},
|
|
},
|
|
methods:{
|
|
methods:{
|
|
|
|
+ enginTypeHasChangeds(enginType = null) {
|
|
|
|
+ if (this.queryParams.enginType == undefined || this.queryParams.enginType == null || this.queryParams.enginType == '')
|
|
|
|
+ return
|
|
|
|
+ this.currentCheckList = []
|
|
|
|
+ this.queryParams.enginClassification = ''
|
|
|
|
+ this.currentEnginTypeChangeOptions1 = []
|
|
|
|
+ getDicts(enginType || this.queryParams1.enginType).then(res => {
|
|
|
|
+ this.currentEnginTypeChangeOptions1 = res.data
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ nodeTypeHasChangeds(enginType = null,enginClassification = null) {
|
|
|
|
+ if ((this.queryParams.enginType == undefined || this.queryParams.enginType == null || this.queryParams.enginType == '')&&(this.queryParams.enginClassification == undefined || this.queryParams.enginClassification == null || this.queryParams.enginClassification == ''))
|
|
|
|
+ return
|
|
|
|
+ this.currentCheckList = []
|
|
|
|
+ this.queryParams.nodeType = ''
|
|
|
|
+ this.currentEnginTypeChangeOptions2 = []
|
|
|
|
+ getDicts(enginType&&enginClassification || this.queryParams.enginType+'_'+this.queryParams.enginClassification).then(res => {
|
|
|
|
+ this.currentEnginTypeChangeOptions2 = res.data
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ enginTypeHasChanged(enginType = null) {
|
|
|
|
+ this.currentCheckList = []
|
|
|
|
+ this.queryParams.enginClassification = ''
|
|
|
|
+ this.currentEnginTypeChangeOptions = []
|
|
|
|
+ getDicts(enginType || this.queryParams.enginType).then(res => {
|
|
|
|
+ this.currentEnginTypeChangeOptions = res.data
|
|
|
|
+ })
|
|
|
|
+ },
|
|
getList()
|
|
getList()
|
|
{
|
|
{
|
|
|
|
|
|
@@ -310,7 +397,8 @@ export default {
|
|
realityQuality:undefined,
|
|
realityQuality:undefined,
|
|
realitySpecifications:undefined,
|
|
realitySpecifications:undefined,
|
|
enginCycle:0
|
|
enginCycle:0
|
|
- },
|
|
|
|
|
|
+ }
|
|
|
|
+ this.AreaCompletionInformationList=[]
|
|
this.tableData=[]
|
|
this.tableData=[]
|
|
//this.handleQuery();
|
|
//this.handleQuery();
|
|
},
|
|
},
|