Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/api/zdsz/engineeringDangerous.js

@@ -42,3 +42,10 @@ export function delEngineeringDangerous(id) {
     method: 'delete'
   })
 }
+
+export function queryEngineeringDangerous({id}) {
+  return request({
+    url: `/zdsz/engineeringDangerous/${id}`,
+    method: 'get',
+  })
+}

src/components/ConstructionDetails/index.vue

@@ -94,6 +94,7 @@ export default {
         },
         // 查看历史
         open(dicts,type = null){
+
             if(type == '1' || type == '2'){
               // 工业 市政
               this.$parent.viewNodeSource()
@@ -103,11 +104,20 @@ export default {
                   label:"历史数据"
                 }
               ]
+            } else if (type === '危险作业工程') {
+              this.$parent.viewNodeSource()
+              this.currentDicts = [
+                {
+                  value: "历史数据",
+                  label: "历史数据"
+                }
+              ]
             }else{
               console.log(dicts)
               this.dialogVisible = true
               this.currentDicts = dicts
             }
+
             this.dialogVisible = true
         }
     }

src/components/EngineeNode/index.vue

@@ -33,8 +33,8 @@
               </el-select>
             </el-form-item> -->
             <!-- <el-form-item label="工程类型" prop="enginType">
-              <el-select 
-                  v-model="currentEnginType" 
+              <el-select
+                  v-model="currentEnginType"
                   placeholder="请选择工程类型"
                   @change="enginTypeHasChanged"
                   >
@@ -54,8 +54,8 @@
                 </el-cascader>
               </el-form-item>
               <!-- <el-form-item label="工程节点">
-                <el-select 
-                    v-model="enginClassification" 
+                <el-select
+                    v-model="enginClassification"
                     placeholder="请选择工程节点"
                     >
                   <el-option
@@ -333,7 +333,7 @@ export default {
             }
           })
 
-          return 
+          return
           // 拿到当前所选择的节点info
           const nodeItem = this.dict.type.engineering_infrastructure.find(e => e.label == this.currentNode[el.index -1])
           this.currentPickedNode = nodeItem
@@ -479,8 +479,8 @@ export default {
                         this.params.zEngineeringNodeBo = {}
                         this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
                         this.params.zEngineeringNodeBo.type = this.nodeType
+                        this.params.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
                         updateEngineeringDangerous(this.params).then(res => {
-                          console.log('危险________',res)
                           if(res.code == 200){
                             this.$message({
                               message: '修改成功',

src/components/EngineePipe/index.vue

@@ -108,93 +108,6 @@
         </div>
     </el-dialog>
     <!-- 节点信息dialog -->
-    <el-dialog :visible="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body
-               customClass="appendElNodeDialog">
-      <el-form ref="nodeForm" :model="zEngineeringInfoBo" :rules="nodeRules" label-width="110px">
-        <el-form-item label="节点类型" prop="type">
-          <el-input v-model="nodeType" placeholder="顶管" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="施工地址" prop="constructAddre">
-          <el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址"></el-input>
-        </el-form-item>
-        <el-form-item label="施工人电话" prop="constructPhone">
-          <el-input v-model="zEngineeringInfoBo.constructPhone" placeholder="请填写施工人电话"></el-input>
-        </el-form-item>
-        <el-form-item label="施工人" prop="constructUser">
-          <el-input v-model="zEngineeringInfoBo.constructUser" placeholder="请填写施工人"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人" prop="headName">
-          <el-input v-model="zEngineeringInfoBo.headName" placeholder="请填写负责人"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人电话" prop="headPhone">
-          <el-input v-model="zEngineeringInfoBo.headPhone" placeholder="请填写负责人电话"></el-input>
-        </el-form-item>
-        <el-form-item label="回填时间" prop="backfillTime">
-          <el-date-picker
-            v-model="zEngineeringInfoBo.backfillTime"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            type="datetime"
-            placeholder="请选择回填日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="施工时间" prop="constructTime">
-          <el-date-picker
-            v-model="zEngineeringInfoBo.constructTime"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            type="datetime"
-            placeholder="请选择施工时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">
-          <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings">
-            <el-option
-              v-for="e in constructAccordingDrawingsOption"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="分段打压" prop="segmentedCompressionQualified">
-          <el-select v-model="zEngineeringInfoBo.segmentedCompressionQualified">
-            <el-option
-              v-for="e in segmentedCompressionQualifiedOption"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="自闭阀类型" prop="selfClosingValveType">
-          <el-select v-model="zEngineeringInfoBo.selfClosingValveType">
-            <el-option
-              v-for="e in dict.type.self_closing_valve_type"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上门类型" prop="visitType">
-          <el-select v-model="zEngineeringInfoBo.visitType">
-            <el-option
-              v-for="e in dict.type.visit_type"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-          <ObsImageUpload ref="obsImageUpload" :limit="9999"
-                          :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
-                          @input="getUrl"></ObsImageUpload>
-        </el-form-item>
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
-        <el-button @click="nodeCancel">取 消</el-button>
-      </el-form>
-    </el-dialog>
-    <!-- 节点信息dialog -->
     <enginee-node
       @closeToSucceed="closeToSucceed"
       ref="childNode"
@@ -239,33 +152,6 @@ export default {
       title: "顶管信息",
       // 是否显示弹出层
       open: false,
-      enginTypeOption: [
-        {
-          value: '0',
-          label: '民用工程'
-        },
-        {
-          value: '2',
-          label: '工业工程'
-        },
-        {
-          value: '1',
-          label: '市政工程'
-        },
-        {
-          value: '3',
-          label: '顶管工程'
-        },
-        {
-          value: '4',
-          label: '危险作业工程'
-        },
-        {
-          value: '5',
-          label: '基建工程'
-        },
-      ],
-      nodeType: '1',               // 节点类型
       // 查询参数
       queryParams: {
         files:[],
@@ -300,7 +186,7 @@ export default {
         zEngiineeringPhotoBoList: [],              // 图片列表
         zEngineeringMaterialBo: [],// 用料对象
 
-      },                          // 节点信息
+      },
       constructAccordingDrawingsOption: [
         {
           value: '1',
@@ -311,16 +197,6 @@ export default {
           label: '否'
         }
       ],
-      segmentedCompressionQualifiedOption: [
-        {
-          value: '1',
-          label: '是'
-        },
-        {
-          value: '0',
-          label: '否'
-        }
-      ],
       nodeDetailVisible: false,
       // 表单参数
       form: {},
@@ -351,28 +227,6 @@ export default {
           {required: false, message: "备注不能为空", trigger: "blur"}
         ],
       },
-      // 节点规则校验
-      nodeRules: {
-        type: [
-          {required: true, message: "施工地址不能为空", trigger: 'blur'}
-        ],
-        constructAddre: [
-          {required: true, message: "施工地址不能为空", trigger: 'blur'}
-        ],
-        constructPhone: [
-          {required: true, message: "施工人电话不能为空", trigger: 'blur'}
-        ],
-        constructUser: [
-          {required: true, message: "施工人不能为空", trigger: 'blur'}
-        ],
-        headName: [
-          {required: true, message: "负责人不能为空", trigger: 'blur'}
-        ],
-        headPhone: [
-          {required: true, message: "负责人电话不能为空", trigger: 'blur'}
-        ],
-
-      },
       currentType: null, // 组件类型 put修改 add新增
     };
   },
@@ -380,7 +234,8 @@ export default {
   },
   methods: {
     // 顶管工程修改
-    putEnginPipe(data, type) {
+    async putEnginPipe(data, type) {
+      await this.reset();
       let newData = data
       let zEngineeringNodeBo = {
         type: data.zengineeringNodeBoList[0].type,

src/views/zdsz/engineeringDangerous/index.vue

@@ -154,6 +154,12 @@
             @click="addNewPipe(scope.row)"
           >新增顶管工程
           </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="mini"
+            @click="viewSource(scope.row)"
+          >历史</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -415,6 +421,10 @@
       @closeToSucceed="closeToSucceed"
     />
     <EngineePipe ref="enginPipe"/>
+    <ConstructionDetails
+      ref="ConstructionDetails"
+      :currentCollapses="currentCollapses"
+    />
   </div>
 </template>
 
@@ -422,12 +432,14 @@
 import {
   listEngineeringDangerous,
   getEngineeringDangerous,
-  delEngineeringDangerous,
+  delEngineeringDangerous, queryEngineeringDangerous,
 } from "@/api/zdsz/engineeringDangerous";
 import EngineeNode from "@/components/EngineeNode/index";
 import data from "@/views/system/dict/data.vue";
 import EngineePipe from '@/components/EngineePipe'
+import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
 import {validPhoneMobile,checkPositiveDecimal} from "@/api/rules";
+import {QueryEngineeIndustry} from "@/api/zdsz/engineeringIndustry";
 
 
 export default {
@@ -438,10 +450,11 @@ export default {
     }
   },
   components: {
-    EngineePipe, EngineeNode
+    EngineePipe, EngineeNode,ConstructionDetails
   },
   data() {
     return {
+      currentCollapses:[],
       nodeType: "危险作业工程",
       nodeDetailVisible: false,
       // 按钮loading
@@ -694,6 +707,22 @@ export default {
     this.getList();
   },
   methods: {
+    viewSource(e){
+      this.currentId = e.id
+      this.$refs.ConstructionDetails.open(_,"危险作业工程")
+    },
+    viewNodeSource(e){
+      // todo: 获取数据
+      queryEngineeringDangerous({
+        id:this.currentId
+      }).then(res => {
+        try {
+          this.currentCollapses = res.data.zEngineeringNodeBos[0].zEngineeringInfoBoList
+        } catch (error) {
+          this.currentCollapses = [];
+        }
+      })
+    },
     closeToSucceed() {
       this.open = false;
       this.getList()

src/views/zdsz/openbolt/index.vue

@@ -140,78 +140,99 @@
     />
 
     <!-- 添加或修改开栓|安检|维修对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="小区" prop="areaId">
-          <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1" style="width: 100%">
-            <el-option
-              v-for="obj in areas"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="楼栋" prop="buildingId">
-          <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1" style="width: 100%">
-            <el-option
-              v-for="obj in builds"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="单元" prop="unitId">
-          <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1" style="width: 100%">
-            <el-option
-              v-for="obj in units"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="房间号" prop="houseId">
-          <el-select v-model="form.houseId" placeholder="请选择房间号" filterable style="width: 100%">
-            <el-option
-              v-for="obj in houses"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安检是否合格" prop="isQualified">
-          <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">
-            <el-option
-              v-for="obj in dict.type.pass_check"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否维修" prop="isMaintenance">
-          <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">
-            <el-option
-              v-for="obj in dict.type.is_repair"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-<!--        <el-form-item label="照片" prop="photo">-->
-<!--          <obs-image-upload v-model="form.photo"/>-->
-<!--        </el-form-item>-->
-        <el-form-item label="照片" prop="picIds">
-          <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
-                       @input="getUrl"></ObsImageUpload>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="小区" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1" style="width: 100%">
+                <el-option
+                  v-for="obj in areas"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="楼栋" prop="buildingId">
+              <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1" style="width: 100%">
+                <el-option
+                  v-for="obj in builds"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单元" prop="unitId">
+              <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1" style="width: 100%">
+                <el-option
+                  v-for="obj in units"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间号" prop="houseId">
+              <el-select v-model="form.houseId" placeholder="请选择房间号" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in houses"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安检是否合格" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.pass_check"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否维修" prop="isMaintenance">
+              <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.is_repair"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="照片" prop="picIds">
+              <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
+                              @input="getUrl"></ObsImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

src/views/zdsz/opencheck/index.vue

@@ -140,77 +140,99 @@
     />
 
     <!-- 添加或修改开栓|安检|维修对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="小区" prop="areaId">
-          <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1">
-            <el-option
-              v-for="obj in areas"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="楼栋" prop="buildingId">
-          <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1">
-            <el-option
-              v-for="obj in builds"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="单元" prop="unitId">
-          <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1">
-            <el-option
-              v-for="obj in units"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="房间号" prop="houseId">
-          <el-select v-model="form.houseId" placeholder="请选择房间号" filterable>
-            <el-option
-              v-for="obj in houses"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安检是否合格" prop="isQualified">
-          <!--          <el-input v-model="form.isQualified" placeholder="请输入安检是否合格" />-->
-          <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable>
-            <el-option
-              v-for="obj in dict.type.pass_check"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否维修" prop="isMaintenance">
-          <!--          <el-input v-model="form.isMaintenance" placeholder="请输入是否维修" />-->
-          <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable>
-            <el-option
-              v-for="obj in dict.type.is_repair"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="照片" prop="picIds">
-          <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
-                          @input="getUrl"></ObsImageUpload>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="小区" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1" style="width: 100%">
+                <el-option
+                  v-for="obj in areas"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="楼栋" prop="buildingId">
+              <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1" style="width: 100%">
+                <el-option
+                  v-for="obj in builds"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单元" prop="unitId">
+              <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1" style="width: 100%">
+                <el-option
+                  v-for="obj in units"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间号" prop="houseId">
+              <el-select v-model="form.houseId" placeholder="请选择房间号" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in houses"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安检是否合格" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.pass_check"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否维修" prop="isMaintenance">
+              <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.is_repair"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="照片" prop="picIds">
+              <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
+                              @input="getUrl"></ObsImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

src/views/zdsz/openrepair/index.vue

@@ -140,77 +140,99 @@
     />
 
     <!-- 添加或修改开栓|安检|维修对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="小区" prop="areaId">
-          <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1">
-            <el-option
-              v-for="obj in areas"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="楼栋" prop="buildingId">
-          <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1">
-            <el-option
-              v-for="obj in builds"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="单元" prop="unitId">
-          <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1">
-            <el-option
-              v-for="obj in units"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="房间号" prop="houseId">
-          <el-select v-model="form.houseId" placeholder="请选择房间号" filterable>
-            <el-option
-              v-for="obj in houses"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安检是否合格" prop="isQualified">
-          <!--          <el-input v-model="form.isQualified" placeholder="请输入安检是否合格" />-->
-          <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable>
-            <el-option
-              v-for="obj in dict.type.pass_check"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否维修" prop="isMaintenance">
-          <!--          <el-input v-model="form.isMaintenance" placeholder="请输入是否维修" />-->
-          <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable>
-            <el-option
-              v-for="obj in dict.type.is_repair"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="照片" prop="picIds">
-          <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
-                          @input="getUrl"></ObsImageUpload>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="小区" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择小区" filterable @change="getBuildings1" style="width: 100%">
+                <el-option
+                  v-for="obj in areas"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="楼栋" prop="buildingId">
+              <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1" style="width: 100%">
+                <el-option
+                  v-for="obj in builds"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单元" prop="unitId">
+              <el-select v-model="form.unitId" placeholder="请选择单元" filterable @change="getHouses1" style="width: 100%">
+                <el-option
+                  v-for="obj in units"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间号" prop="houseId">
+              <el-select v-model="form.houseId" placeholder="请选择房间号" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in houses"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安检是否合格" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.pass_check"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否维修" prop="isMaintenance">
+              <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">
+                <el-option
+                  v-for="obj in dict.type.is_repair"
+                  :key="obj.value"
+                  :label="obj.label"
+                  :value="obj.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="照片" prop="picIds">
+              <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.picIds"
+                              @input="getUrl"></ObsImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>