工程材质加工程步骤选项、小区导入模版增加户主信息、小区与房间手动修改增加操作

src/components/ConstructionDetails/index.vue

@@ -55,7 +55,7 @@
                     <el-form-item
                       :prop="i.materialQuality"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
-                      label="材质"
+                      :label="activeNames == '阀管' ? '灶具管厂家': '材质'"
                       v-show="i.materialQuality != null"
                       label-width="95px"
                       >
@@ -63,7 +63,7 @@
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
                       <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
                           <el-option
-                          v-for="e in materialQualityList"
+                          v-for="e in (activeNames == '阀管' ?materialQualityList_zjg:materialQualityList)"
                           :key="e.id"
                           :label="e.name"
                           :value="e.id"
@@ -142,10 +142,10 @@
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
                       <el-select v-model="i.corrosionLevel" placeholder="请选择腐蚀等级" style="width: 100%" :disabled="status == 'read-only' ">
                           <el-option
-                          v-for="e in corrosionLevelList"
-                          :key="e.dictValue"
-                          :label="e.dictLabel"
-                          :value="e.dictValue"
+                          v-for="e in materialQualityList"
+                          :key="e.id"
+                          :label="e.name"
+                          :value="e.id"
                           ></el-option>
                       </el-select>
                     </el-form-item>
@@ -177,10 +177,10 @@
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
                       <el-select v-model="i.selfClosingValveType" placeholder="请选择自闭阀类型" style="width: 100%" :disabled="status == 'read-only' ">
                           <el-option
-                          v-for="e in dict.type.self_closing_valve_type"
-                          :key="e.value"
-                          :label="e.label"
-                          :value="e.value"
+                            v-for="e in materialQualityList_zjg"
+                            :key="e.id"
+                            :label="e.name"
+                            :value="e.id"
                           ></el-option>
                       </el-select>
                     </el-form-item>
@@ -194,10 +194,10 @@
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
                       <el-select v-model="i.brand" placeholder="请选择品牌" style="width: 100%" :disabled="status == 'read-only' ">
                           <el-option
-                          v-for="e in dict.type.brand"
-                          :key="e.value"
-                          :label="e.label"
-                          :value="e.value"
+                            v-for="e in materialQualityList"
+                            :key="e.id"
+                            :label="e.name"
+                            :value="e.id"
                           ></el-option>
                       </el-select>
                     </el-form-item>
@@ -416,6 +416,8 @@ export default {
   props: ['currentCollapses','nodeDetailType','enginType','status','zEngineeringNodeBo'],
   data() {
     return {
+      enginSort:'',
+      enginNode:'',
       currentDicts: [],              // 当前类型工程节点项
       dialogVisible: false,
       activeNames: '',
@@ -431,7 +433,8 @@ export default {
         }
       ],
       nodesource:'',// 审核状态option
-      corrosionLevelList:[],                      // 腐蚀等级option
+      materialQualityList_zbf:[],                      // 自闭阀option
+      materialQualityList_zjg:[],                      // 灶具管option
       materialQualityList:[],                     // 材质
       specificationsList:[],                      // 规格
       materialComponList:[],
@@ -476,11 +479,6 @@ export default {
         console.log('规格',res.data)
         this.corrosionLevelListAll = res.data
       })
-      // 获取腐蚀等级
-      getDictType({dictType:'corrosion_level'}).then(res => {
-          console.log('腐蚀等级',res)
-          this.corrosionLevelList = res.data
-      })
 
   },
   mounted() {
@@ -616,6 +614,27 @@ export default {
     },
     // 查看历史
     open(dicts, type = null,currentStatus = null,kind = null,title= null) {
+      let data = {enginType:this.enginType}
+      if (this.enginSort !== undefined){
+        data['enginSort'] = this.enginSort
+        data['enginNode'] = this.enginNode
+      }
+      // 腐蚀等级
+      data.enginStep = this.activeNames;
+      if(this.activeNames == '阀管'){
+        data.nameType = "自闭阀厂家";
+        getEnginMaterialQualityList(data).then(res => {
+          this.materialQualityList_zbf = res.data
+        })
+        data.nameType = "灶具管厂家";
+        getEnginMaterialQualityList(data).then(res => {
+          this.materialQualityList_zjg = res.data
+        })
+      }
+      getEnginMaterialQualityList(data).then(res => {
+        this.materialQualityList = res.data
+      })
+
       this.currentStatus = currentStatus
       this.titleName = title
       this.checkingVisible = false

src/components/EnginNodeInfo/index.vue

@@ -112,15 +112,14 @@
         <el-col :span="7" v-show="materialComponList.includes('materialQuality')" v-if="enginType != '基建工程'">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
-            label-width="50px"
-            label="材质"
-
+            label-width="90px"
+            :label="materialComponList.includes('selfClosingValveType') ? '灶具管厂家': '材料'"
           >
             <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
             <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
             <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(item, index)">
               <el-option
-                v-for="e in materialQualityList"
+                v-for="e in (materialComponList.includes('selfClosingValveType') ? materialQualityList_zjg:materialQualityList)"
                 :key="e.id"
                 :label="e.name"
                 :value="e.id"
@@ -229,7 +228,7 @@
         <el-col :span="7" v-if="materialComponList.includes('brand')">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.brand'"
-            label-width="50px"
+            label-width="55px"
             label="品牌"
             :rules="{ required: true, message: '请选择品牌', trigger: ['change','blur']} "
           >
@@ -237,10 +236,10 @@
             <!--                  <el-input v-model="item.specifications" placeholder="请输入规格" style="width: 100%"/>-->
             <el-select v-model="item.brand" placeholder="请选择品牌" style="width: 100%">
               <el-option
-                v-for="e in dict.type.brand"
-                :key="e.value"
-                :label="e.label"
-                :value="e.value"
+                v-for="e in materialQualityList"
+                :key="e.id"
+                :label="e.name"
+                :value="e.id"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -256,16 +255,16 @@
             <!--                  <el-input v-model="item.specifications" placeholder="请输入规格" style="width: 100%"/>-->
             <el-select v-model="item.corrosionLevel" placeholder="请选择腐蚀等级" style="width: 100%">
               <el-option
-                v-for="e in corrosionLevelList"
-                :key="e.dictValue"
-                :label="e.dictLabel"
-                :value="e.dictValue"
+                v-for="e in materialQualityList"
+                :key="e.id"
+                :label="e.name"
+                :value="e.id"
               ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="7" v-show="materialComponList.includes('visitType')">
-          <el-form-item label="上门类型" :prop="'zEngineeringMaterialBo.' + index + '.visitType'" label-width="68px" style="position: absolute;left: -1.6%;">
+          <el-form-item label="上门类型" :prop="'zEngineeringMaterialBo.' + index + '.visitType'" label-width="93px" style="position: absolute;left: -1.6%;">
             <el-select v-model="item.visitType" style="width: 100%;">
               <el-option
                 v-for="e in dict.type.visit_type"
@@ -277,13 +276,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="7" v-show="materialComponList.includes('selfClosingValveType')" style="position: relative;left: 25.5%;">
-          <el-form-item label="自闭阀类型" :prop="'zEngineeringMaterialBo.' + index + '.selfClosingValveType'" label-width="91px">
+          <el-form-item label="自闭阀类型" :prop="'zEngineeringMaterialBo.' + index + '.selfClosingValveType'" label-width="133px">
             <el-select v-model="item.selfClosingValveType" style="width: 100%;">
               <el-option
-                v-for="e in dict.type.self_closing_valve_type"
-                :key="e.value"
-                :label="e.label"
-                :value="e.value"
+                v-for="e in materialQualityList_zbf"
+                :key="e.id"
+                :label="e.name"
+                :value="e.id"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -339,7 +338,8 @@ export default {
           label:'不合格'
         }
       ],
-      corrosionLevelList:[],                      // 腐蚀等级option
+      materialQualityList_zbf:[],                      // 自闭阀option
+      materialQualityList_zjg:[],                      // 灶具管option
       materialQualityList:[],                     // 材质
       specificationsList:[],                      // 规格
       materialComponList:[],
@@ -379,17 +379,22 @@ export default {
       data['enginSort'] = this.enginSort
       data['enginNode'] = this.enginNode
     }
-    // 获取材质
+    // 腐蚀等级
+    data.enginStep = this.name;
+    if(this.name == '阀管'){
+      data.nameType = "自闭阀厂家";
+      getEnginMaterialQualityList(data).then(res => {
+        this.materialQualityList_zbf = res.data
+      })
+      data.nameType = "灶具管厂家";
+      getEnginMaterialQualityList(data).then(res => {
+        this.materialQualityList_zjg = res.data
+      })
+    }
     getEnginMaterialQualityList(data).then(res => {
       console.log('材质',res)
       this.materialQualityList = res.data
     })
-    // 获取腐蚀等级
-    getDictType({dictType:'corrosion_level'}).then(res => {
-      console.log('腐蚀等级',res)
-      this.corrosionLevelList = res.data
-    })
-    console.log('update',this.updateOption)
   },
   mounted(){
 

src/views/zdsz/enginMaterialQuality/index.vue

@@ -52,6 +52,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="材料项" prop="nameType" v-if="queryParams.enginStep == '阀管'">
+        <el-select v-model="queryParams.nameType" placeholder="请选择材料项" filterable clearable
+                   style="width: 100%">
+          <el-option
+            v-for="dict in dict.type.quality_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -132,6 +143,11 @@
           <dict-tag :options="dict.type[scope.row.enginSort+'_'+scope.row.enginNode]" :value="scope.row.enginStep"/>
         </template>
       </el-table-column>
+      <el-table-column label="材料项" align="center" prop="nameType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.quality_type" :value="scope.row.nameType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -209,6 +225,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="材料项" prop="nameType" v-if="form.enginStep == '阀管'">
+          <el-select v-model="form.nameType" placeholder="请选择材料项" filterable clearable
+                     style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.quality_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="材质名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入材质名称" maxlength="50"/>
         </el-form-item>
@@ -232,7 +259,8 @@ import {
 
 export default {
   name: "EnginMaterialQuality",
-  dicts: ['engin_type','old_renovation','new_built','old_renovation_indoor_engin','old_renovation_courtyard','old_renovation_overhead','new_built_indoor_engin','new_built_courtyard','new_built_overhead'],
+  dicts: ['engin_type','old_renovation','new_built','old_renovation_indoor_engin','old_renovation_courtyard','old_renovation_overhead',
+    'new_built_indoor_engin','new_built_courtyard','new_built_overhead','quality_type'],
   data() {
     return {
       // 按钮loading
@@ -309,6 +337,7 @@ export default {
         enginSort: undefined,
         enginNode: undefined,
         enginStep: undefined,
+        nameType: undefined,
         updateBy: undefined,
         updateTime: undefined
       };

src/views/zdsz/engineeringCivil/index.vue

@@ -1105,6 +1105,7 @@ export default {
         }
       ],
       currentCheckList: [],
+      enginType:'',
       enginClassificationinfo: '',
       enginClassification: '',
       enginClassificationOption: [],
@@ -1453,6 +1454,8 @@ export default {
             "value": res.data[i].dictValue,
           })
         }
+        this.$refs.ConstructionDetails.enginSort = e.enginType;
+        this.$refs.ConstructionDetails.enginNode = e.enginClassification;
         this.$refs.ConstructionDetails.open(dict, null, null, null, title)
       })
     },