bug修复

src/views/zdsz/enginee/material/progres_visual/index.vue

@@ -65,6 +65,29 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="工程类型" prop="enginType">
+          <el-select v-model="searchParam.enginType" placeholder="请选择工程类型"  filterable clearable
+                     @change="enginTypeHasChangeds"
+          >
+            <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="searchParam.enginClassification" placeholder="请选择工程分类" clearable-->
+<!--                     @clear="currentEnginTypeChangeOptions1=[];searchParam.enginClassification=undefined;searchParam.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="enginCycle" style="width: 218px;">-->
 <!--          <el-select-->
 <!--            :disabled="title == '添加用料' "-->
@@ -134,7 +157,7 @@
       </div> -->
       <el-button class="searchBtn" @click="searchCompletionInfo">查询</el-button>
 <!--      <el-button class="searchBtn">导出</el-button>-->
-      <div class="unitStatus">
+      <div class="unitStatus" >
         <div
           v-for="(e,idx) in unitStatusOption"
           :key="idx"
@@ -209,6 +232,15 @@ export default {
       currentMenu: 3,   // 0:用料管理 1:进度统计 2:可视化进度
       currentCollapses: [],
       status: '',
+      enginTypeOption: [
+      {
+        value: 'old_renovation',
+        label: '旧改'
+      }, {
+        value: 'new_built',
+        label: '新建'
+      },
+    ],
       typeOptions: [
         {
           value: '0',
@@ -279,12 +311,16 @@ export default {
       info: {
         district: undefined,
       },
+      currentCheckList:[],
+      currentEnginTypeChangeOptions1: [],
       searchParam: {
         district: null,
         enginCycle: 0,
         areaId: null,
         buildingId: null,
         unitId: null,
+        enginClassification:null,
+
       },
       roomsInfo: [],
       AreaCompletionInformationList:[],
@@ -306,13 +342,22 @@ export default {
     }
   },
   methods: {
+    enginTypeHasChangeds(enginType = null) {
+      if (this.searchParam.enginType == undefined || this.searchParam.enginType == null || this.searchParam.enginType == '')
+        return
+      this.currentCheckList = []
+      this.searchParam.enginClassification = ''
+      this.currentEnginTypeChangeOptions1 = []
+      getDicts(enginType || this.searchParam.enginType).then(res => {
+        this.currentEnginTypeChangeOptions1 = res.data
+      })
+    },
     toDetail(e) {
       this.currentRoomId = e.roomId
       let dictValue
       // 拼接字典
-      console.log(e)
+      console.log('e', this.dict)
       console.log(e.enginCycle)
-      e.enginCycle = 0
       console.log(this.dict.type[e.enginCycle])
       this.dict.type[e.enginCycle].forEach(v => {
         if (v.label.includes('室内')) {
@@ -365,6 +410,7 @@ export default {
             areaId: this.searchParam.areaId,
             buildingId: this.searchParam.buildingId,
             unitId: this.searchParam.unitId,
+            enginType:this.searchParam.enginType,
           }
           getObtainRoomcCompletionInformationList(params).then(res => {
             let info = []
@@ -456,7 +502,7 @@ export default {
       width: 13%;
       display: flex;
       position: absolute;
-      right: 7%;
+      right: 3%;
       height: 5%;
     }
   }