提交代码

src/views/gas/regulatorBox/index.vue

@@ -79,10 +79,14 @@
     <el-table v-loading="loading" :data="regulatorBoxList" @selection-change="handleSelectionChange">
       <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="name"/>
+      <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="administrativeOffice"/>
+      <el-table-column label="管理所" align="center" prop="administrativeOffice">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.administrative_office" :value="scope.row.administrativeOffice"/>
+        </template>
+      </el-table-column>
       <el-table-column label="编号" align="center" prop="number"/>
       <el-table-column label="创建人" align="center" prop="createByName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -130,35 +134,20 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="180px" :disabled="disabled">
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="调压箱名称" prop="areaId">
-              <el-input v-model="form.name" placeholder="请输入调压箱名称"/>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="所属楼宇" prop="buildingId">-->
-          <!--              <el-select v-model="form.buildingId" filterable placeholder="请选择所属楼宇" @change="getUnitList"-->
-          <!--                         clearable size="small" style="width: 100%">-->
-          <!--                <el-option v-for="item in buildingList"-->
-          <!--                           :key="item.id"-->
-          <!--                           :label="item.name"-->
-          <!--                           :value="item.id"/>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="所属单元" prop="unitId">-->
-          <!--              <el-select v-model="form.unitId" filterable placeholder="请输入所属单元" clearable size="small"-->
-          <!--                         style="width: 100%">-->
-          <!--                <el-option v-for="item in unitList"-->
-          <!--                           :key="item.id"-->
-          <!--                           :label="item.name"-->
-          <!--                           :value="item.id"/>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
+            <el-form-item label="小区名称" prop="areaId">
+              <el-input v-model="form.areaName" placeholder="请输入小区名称"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="管理所" prop="administrativeOffice">
-              <el-input v-model="form.administrativeOffice" placeholder="请输入管理所"/>
+              <el-select v-model="form.administrativeOffice" placeholder="请输入管理所" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.administrative_office"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -513,7 +502,7 @@ import el from "element-ui/src/locale/lang/el";
 
 export default {
   name: "RegulatorBox",
-  dicts: ['appearance', 'square_brick', 'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv', 'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities', 'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
+  dicts: ['appearance','administrative_office', 'square_brick', 'guardrail', 'foundation', 'pressure_gage', 'valve', 'voltage_regulator', 'xtv', 'disconnector_test_status', 'filter', 'special_case_of_pressure_regulating_facilities', 'overdue_inspection_days', 'reason_for_overdue_inspection', 'valve_well_condition'],
   data() {
     return {
       buildingList: [], // 楼宇集合