wang_xy 1 рік тому
батько
коміт
7d5c745463

+ 7 - 0
src/api/system/user.js

@@ -1,6 +1,13 @@
 import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
 
+export function selectUserByUserName(query) {
+  return request({
+    url: '/system/user/selectUserByUserName',
+    method: 'get',
+    params: {userName:query}
+  })
+}
 // 查询用户列表
 export function listUser(query) {
   return request({

+ 11 - 4
src/components/ConstructionDetails/index.vue

@@ -44,10 +44,8 @@
 <!--              <span>负责人电话:{{-->
 <!--                  e.headPhone === undefined || e.headPhone === null || e.headPhone === '' ? '无' : e.headPhone-->
 <!--                }}</span>-->
-              <span>施工人:{{ e.constructUser }}</span>
-              <span>施工人电话:{{
-                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone
-                  }}</span>
+              <span>施工人:{{ userNames[idx].nickName }}</span>
+              <span>施工人电话:{{ userNames[idx].phonenumber }}</span>
             </div>
             <hr>
             <!--带气封堵施工 start-->
@@ -808,6 +806,7 @@ import {
   getDictType, deleteinfoById,                                    // 腐蚀程度
 
 } from '@/api/zdsz/enginee'
+import {selectUserByUserName} from '@/api/system/user'
 import ObsVideoUpload from "@/components/ObsVideoUpload/index.vue";
 import {delEngineeringCivil} from "@/api/zdsz/engineeringCivil";
 export default {
@@ -822,6 +821,8 @@ export default {
   props: ['currentCollapses','nodeDetailType','enginType','status','zEngineeringNodeBo'],
   data() {
     return {
+      userNames:[],
+
       enginSort:'',
       checkList:[],
       enginNode:'',
@@ -911,6 +912,12 @@ export default {
       // alert(item1[0].value)
     },
     currentCollapses(){
+      this.userNames = [];
+      for(let i in this.currentCollapses){
+        selectUserByUserName(this.currentCollapses[i].createBy).then(res => {
+          this.userNames.push(res);
+        })
+      }
       try {
         console.log(1)
         this.currentCollapses[0].zEngineeringReviewBo.reviewStatus != 1 ? this.isChecking = true : false

+ 29 - 25
src/views/zdsz/enginMaterialQuality/index.vue

@@ -81,30 +81,31 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['zdsz:enginMaterialQuality:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['zdsz:enginMaterialQuality:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-i-->
+<!--          v-hasPermi="['zdsz:enginMaterialQuality:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['zdsz:enginMaterialQuality:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -155,6 +156,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.createBy == loginUserName"
             v-hasPermi="['zdsz:enginMaterialQuality:edit']"
           >修改
           </el-button>
@@ -163,6 +165,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.createBy == loginUserName"
             v-hasPermi="['zdsz:enginMaterialQuality:remove']"
           >删除
           </el-button>
@@ -256,13 +259,14 @@ import {
   addEnginMaterialQuality,
   updateEnginMaterialQuality
 } from "@/api/zdsz/enginMaterialQuality";
-
+import loginUser from "@/store/modules/user";
 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','quality_type'],
   data() {
     return {
+      loginUserName:loginUser.state.name,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层

+ 28 - 25
src/views/zdsz/enginSpecifications/index.vue

@@ -37,30 +37,30 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['zdsz:enginSpecifications:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['zdsz:enginSpecifications:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['zdsz:enginSpecifications:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['zdsz:enginSpecifications:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="warning"-->
@@ -87,6 +87,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.createBy == loginUserName"
             v-hasPermi="['zdsz:enginSpecifications:edit']"
           >修改
           </el-button>
@@ -95,6 +96,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.createBy == loginUserName"
             v-hasPermi="['zdsz:enginSpecifications:remove']"
           >删除
           </el-button>
@@ -144,12 +146,13 @@ import {
   updateEnginSpecifications
 } from "@/api/zdsz/enginSpecifications";
 import {listEnginMaterialQuality} from "@/api/zdsz/enginMaterialQuality";
-
+import loginUser from "@/store/modules/user";
 export default {
   name: "EnginSpecifications",
   dicts: ['engin_type'],
   data() {
     return {
+      loginUserName:loginUser.state.name,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层

+ 144 - 259
src/views/zdsz/engineeringGasOpening/index.vue

@@ -9,26 +9,67 @@
   <div class="app-container">
     <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch"
              label-width="110px">
-      <!--<el-form-item label="工程类型" prop="enginType">-->
-        <!--<el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>-->
-          <!--<el-option-->
-            <!--v-for="dict in EngineepipeType"-->
-            <!--:key="dict.value"-->
-            <!--:label="dict.label"-->
-            <!--:value="dict.value"-->
-          <!--/>-->
-        <!--</el-select>-->
-      <!--</el-form-item>-->
-      <el-form-item label="工程名称" prop="enginName">
-        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" maxlength="20"></el-input>
+      <el-form-item label="行政区" prop="district">
+        <el-select v-model="searchParams.district" placeholder="请选择行政区" clearable
+                   @change="searchParams.areaId = undefined;areaList=[];
+                   searchParams.buildingId = undefined;buildingList=[];
+                   searchParams.unitId = undefined;unitList=[];
+                   searchParams.houseId = undefined;houseList=[];
+                   getAreaList(searchParams.district)">
+          <el-option
+            v-for="dict in dict.type.district"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="小区名称" prop="areaId">
+        <el-select v-model="searchParams.areaId" filterable clearable placeholder="请选择小区"
+                   @change="searchParams.buildingId = undefined;buildingList=[];
+                   searchParams.unitId = undefined;unitList=[];
+                   searchParams.houseId = undefined;houseList=[];
+                   getBuildingList1(searchParams.areaId)">
+          <el-option
+            v-for="item in areaList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="楼宇名称" prop="buildingId">
+        <el-select v-model="searchParams.buildingId" filterable clearable placeholder="请选择楼宇"
+                   @change="searchParams.unitId = undefined;unitList=[];
+                   searchParams.houseId = undefined;houseList=[];
+                   getUnitList1(searchParams.buildingId)">
+          <el-option
+            v-for="item in buildingList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单元" prop="unitId">
+        <el-select v-model="searchParams.unitId" placeholder="请选择单元" filterable clearable
+                   @change="searchParams.houseId = undefined;houseList=[];getHouseList1(searchParams.unitId)"
+        >
+          <el-option
+            v-for="obj in unitList"
+            :key="obj.id"
+            :label="obj.name"
+            :value="obj.id"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="工程类型" prop="enginType" v-if="engineeType">
-        <el-select v-model="searchParams.enginType" placeholder="请选择工程类型">
+      <el-form-item label="房间" prop="houseId">
+        <el-select v-model="searchParams.houseId" placeholder="请选择房间" filterable clearable>
           <el-option
-            v-for="e in dict.type.air_wall_node"
-            :key="e.value"
-            :label="e.label"
-            :value="e.value"
+            v-for="obj in houseList"
+            :key="obj.id"
+            :label="obj.name"
+            :value="obj.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -79,7 +120,7 @@
 
     <el-table v-loading="loading" :data="comprehensiveList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="工程名称" align="center" prop="enginName"/>
+<!--      <el-table-column label="工程名称" align="center" prop="enginName"/>-->
       <el-table-column label="行政区" align="center" prop="district">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.district" :value="scope.row.district"/>
@@ -89,7 +130,7 @@
       <el-table-column label="楼宇名称" align="center" prop="buildingName"/>
       <el-table-column label="单元名称" align="center" prop="unitName"/>
       <el-table-column label="房间名称" align="center" prop="houseName"/>
-      <el-table-column label="燃气表号" align="center" prop="gasMeterNumber"/>
+<!--      <el-table-column label="燃气表号" align="center" prop="gasMeterNumber"/>-->
       <!--<el-table-column label="工程类型" align="center" prop="enginType">-->
         <!--<template slot-scope="scope">-->
           <!--<span>{{ parseDict(scope.row.enginType, 'air_wall_node') }}</span>-->
@@ -105,41 +146,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['zdsz:engineeringIndustry:edit']"
-          >修改
-          </el-button>
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            size="mini"
-            v-hasPermi="['zdsz:engineeringIndustry:edit']"
-            @click="updateviewSource(scope.row)"
-          >修改施工信息
-          </el-button>
-          <el-button type="text"
-                     icon="el-icon-edit"
-                     size="mini"
-                     v-hasPermi="['zdsz:engineeringIndustry:add']"
-                     @click="addzEngineeringMaterBo(scope.row)"
-          >添加用料
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-hasPermi="['zdsz:engineeringPipeJacking:add']"
-            @click="addNewPipe(scope.row)"
-          >新增顶管工程
-          </el-button>
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            size="mini"
+            icon="el-icon-view"
+            @click="handleview(scope.row)"
             v-hasPermi="['zdsz:engineeringIndustry:query']"
-            @click="viewSource(scope.row)"
-          >历史施工
+          >查看
           </el-button>
           <el-button
             size="mini"
@@ -160,20 +170,24 @@
       :limit.sync="searchParams.pageSize"
       @pagination="getList"
     />
-    <!-- 顶管工程新增 -->
-    <EngineePipe ref="enginPipe"/>
-    <!-- 添加或修改市政工程|工业工程对话框 -->
+    <!-- 添加或修改开栓工程对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="height: 100%">
         <el-row>
           <el-col :span="12">
+            <h1>基础信息</h1>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4">
             <el-form-item label="行政区" prop="district">
               <el-select
                   :disabled="title == '添加用料' "
-                  v-model="queryParams.district"
+                  v-model="form.district"
                   placeholder="请选择行政区"
                   filterable
                   @change="districtHasChanged"
+                  style="width: 150px"
               >
                 <el-option
                     v-for="e in dict.type.district"
@@ -184,14 +198,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="4">
             <el-form-item label="小区" prop="areaId">
               <el-select
                   :disabled="title == '添加用料' "
-                  v-model="queryParams.areaId"
+                  v-model="form.areaId"
                   filterable
                   placeholder="请选择小区"
                   @change="communityHasChanged"
+                  style="width: 150px"
               >
                 <el-option
                     v-for="e in communityOptions"
@@ -202,16 +217,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="4">
             <el-form-item label="楼栋" prop="buildingId">
               <el-select
                   :disabled="title == '添加用料' "
                   filterable
-                  v-model="queryParams.buildingId"
+                  v-model="form.buildingId"
                   placeholder="请选择楼栋"
                   @change="buildingHasChanged"
+                  style="width: 150px"
               >
                 <el-option
                     v-for="e in buildingOptions"
@@ -222,14 +236,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="4">
             <el-form-item label="单元" prop="unitId">
               <el-select
                   :disabled="title == '添加用料' "
-                  v-model="queryParams.unitId"
+                  v-model="form.unitId"
                   filterable
                   placeholder="请选择单元"
                   @change="unitHasChanged"
+                  style="width: 150px"
               >
                 <el-option
                     v-for="e in unitOptions"
@@ -240,15 +255,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="4">
             <el-form-item label="房间" prop="houseId">
               <el-select
                   :disabled="title == '添加用料' "
-                  v-model="queryParams.houseId"
+                  v-model="form.houseId"
                   filterable
                   placeholder="请选择房间"
+                  style="width: 150px"
               >
                 <el-option
                     v-for="e in houseOptions"
@@ -260,9 +274,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--<el-form-item label="工程名称" prop="enginName">-->
-          <!--<el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"></el-input>-->
-        <!--</el-form-item>-->
         <el-row>
           <el-col :span="12">
             <h1>燃气立杠</h1>
@@ -278,14 +289,6 @@
                     :label="dict.value"
                 >{{dict.label}}</el-radio>
               </el-radio-group>
-              <!--<el-select v-model="form.isAntiCorrosionPaint" placeholder="请选择立杠是否刷涂防腐漆" style="width: 100%">-->
-                <!--<el-option-->
-                    <!--v-for="e in dict.type.sys_yes_no"-->
-                    <!--:key="e.value"-->
-                    <!--:label="e.label"-->
-                    <!--:value="e.value"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -477,7 +480,6 @@
           </el-col>
         </el-row>
         <el-form-item label="是否使用防风圈" prop="isWindproofCircle">
-          <el-select v-model="form.isWindproofCircle" placeholder="请选择是否使用防风圈" style="width: 100%">
             <el-radio-group v-model="form.isWindproofCircle">
               <el-radio
                   v-for="dict in dict.type.sys_yes_no"
@@ -485,7 +487,6 @@
                   :label="dict.value"
               >{{dict.label}}</el-radio>
             </el-radio-group>
-          </el-select>
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -542,78 +543,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--<el-form-item label="品牌" prop="gasMeterBrand">-->
-          <!--<el-input v-model="form.gasMeterBrand" placeholder="请填写品牌" maxlength="60"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="建筑单位" prop="constructUnit">-->
-          <!--<el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="项目负责人" prop="projectHead">-->
-          <!--<el-input v-model="form.projectHead" placeholder="请填写项目负责人" maxlength="20"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="现场负责人" prop="sceneHead">-->
-          <!--<el-input v-model="form.sceneHead" placeholder="请填写现场负责人" maxlength="20"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="设计单位" prop="designUnit">-->
-          <!--<el-input v-model="form.designUnit" placeholder="请填写设计单位" maxlength="50"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="设计负责人" prop="designHead">-->
-          <!--<el-input v-model="form.designHead" placeholder="请填写现场负责人" maxlength="20"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="设计联系方式" prop="designPhone">-->
-          <!--<el-input v-model="form.designPhone" placeholder="请填写设计联系方式" maxlength="13"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="监理单位" prop="supervisionUnit">-->
-          <!--<el-input v-model="form.supervisionUnit" placeholder="请填写监理单位" maxlength="50"/>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="监理负责人" prop="supervisionHead">-->
-          <!--<el-input v-model="form.supervisionHead" placeholder="请填写监理负责人" maxlength="20"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="监理联系电话" prop="supervisionPhone">-->
-          <!--<el-input v-model="form.supervisionPhone" placeholder="请填写监理联系电话" maxlength="13"></el-input>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="工程类型" prop="enginType">-->
-          <!--<el-select v-model="form.enginType" placeholder="请选择工程类型" style="width: 100%">-->
-            <!--<el-option-->
-              <!--v-for="e in EngineepipeType"-->
-              <!--:key="e.value"-->
-              <!--:label="e.label"-->
-              <!--:value="e.value"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="工程类型" prop="enginType">-->
-          <!--<el-select v-model="form.enginType" placeholder="请选择工程类型" style="width: 100%">-->
-            <!--<el-option-->
-              <!--v-for="e in dict.type.air_wall_node"-->
-              <!--:key="e.value"-->
-              <!--:label="e.label"-->
-              <!--:value="e.value"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-row :gutter="20">-->
-          <!--<el-col :span="24">-->
-            <!--<el-form-item label="附件" v-if="form.id" style="width: 100%">-->
-              <!--<ObsFileUpload ref="obsFileUpload" :file-size="100"-->
-                             <!--:file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"-->
-                             <!--:limit="9999"-->
-                             <!--:value="form.pics"-->
-                             <!--@input="filesUpload"-->
-              <!--&gt;</ObsFileUpload>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="附件" v-else style="width: 100%">-->
-              <!--<ObsFileUpload ref="obsFileUpload" :file-size="100"-->
-                             <!--:file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"-->
-                             <!--:limit="9999"-->
-                             <!--:value="form.files"-->
-                             <!--@input="filesUpload"-->
-              <!--&gt;</ObsFileUpload>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-        <!--</el-row>-->
         <div style="width: 25%; float: right">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm" v-if="buttonLoading">提交</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
         <br/>
@@ -623,96 +554,6 @@
         <br/>
       </el-form>
     </el-dialog>
-    <!-- 施工信息dialog -->
-    <el-dialog :visible.sync="nodeDetailVisible" title="施工信息" append-to-body customClass="appendElNodeDialog"
-               width="70% !important">
-      <el-form ref="nodeForm" :model="zEngineeringNodeBo.zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
-        <el-form-item label="施工时间" prop="constructTime">
-          <el-date-picker
-            v-model="zEngineeringNodeBo.zEngineeringInfoBo.constructTime"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            type="datetime"
-            style="width: 100%"
-            placeholder="请选择施工时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-row>
-          <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-            <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']"
-                            :value="zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList"
-                            @input="getUrl"></ObsImageUpload>
-          </el-form-item>
-        </el-row>
-        <el-row v-for="(item, index) in zEngineeringMaterialBo" :key="index">
-          <el-col :span="7">
-            <el-form-item
-              :prop="`${item.id}.materialQuality`"
-              style="margin-left: 120px"
-              label-width="auto"
-              label="材质"
-            >
-              <el-select v-model="item.materialQuality" placeholder="请选择材质" style="width: 70%"
-                         @change="getEnginSpecificationsList(item, index)">
-                <el-option
-                  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">
-            <el-form-item
-              :prop="`${item.id}.specifications`"
-              style="margin-left: 80px"
-              label-width="auto"
-              label="规格"
-            >
-              <el-select v-model="item.specifications" placeholder="请选择规格" style="width: 70%">
-                <el-option
-                  v-for="e in zEngineeringMaterialBo.specifications"
-                  :key="e.id"
-                  :label="e.name"
-                  :value="e.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item
-              :prop="`${item.id}.number`"
-              style="margin-left: 40px"
-              label-width="auto"
-              label="数量"
-            >
-              <div class="block" style="display: inline-block; margin-right: 20px;">
-                <el-input v-model="item.number" placeholder="请输入数量" style="width: 100%" maxlength="8"/>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item style="margin-left: -120px;">
-              <el-button v-if="zEngineeringMaterialBo.length > 1" @click="removezEngineeringMaterialBo(index)">
-                删除
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div style="width: 25%; float: right">
-          <el-button @click="addzEngineeringMaterialBo">添加用料</el-button>
-          <el-button :loading="buttonLoading" type="primary" @click="updateMaterBo">提交</el-button>
-          <el-button @click="nodeCancel">取 消</el-button>
-        </div>
-      </el-form>
-    </el-dialog>
-    <ConstructionDetails
-      ref="ConstructionDetails"
-      :status="status"
-      :currentCollapses="currentCollapses"
-      @updateNodeOption="updateNodeOption"
-      :enginType="enginType"
-    />
   </div>
 </template>
 <script>
@@ -743,19 +584,13 @@ import {getBuildingList} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
 import {getHouses} from "@/api/zdsz/house";
 import {getDicts} from "@/api/system/dict/data";
-import EngineePipe from '@/components/EngineePipe'
 import {validPhoneMobile} from '@/api/rules'
-import ConstructionDetails from '@/components/ConstructionDetails/index.vue'
 import {getEnginMaterialQualityList} from '@/api/zdsz/enginee'
 import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
   name: "openrepair",
   dicts: ['sys_yes_no', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification', 'engineering_infrastructure', 'air_wall_node', 'gas_meter_direction', 'gas_change_type', 'district'],
-  components: {
-    ConstructionDetails,
-    EngineePipe
-  },
   data() {
     // 自定义校验
     const validatePicPass = (rule, value, callback) => {
@@ -928,10 +763,17 @@ export default {
       searchParams: {
         pageSize: 10,
         pageNum: 1,
-        enginName: null,             // 工程名称
-        enginType: null,   // 工程类型
-        // enginClassification: null,   // 工程类型
+        district: undefined,
+        areaId: undefined,
+        buildingId: undefined,
+        unitId: undefined,
+        houseId: undefined,
       },
+      areaList: [],
+      buildingList: [],
+      unitList: [],
+      houseList: [],
+
       currentType: null, // 附件组件类型 put修改 add新增
     };
   },
@@ -953,9 +795,9 @@ export default {
   methods: {
     // 当前所选行政区发生改变 查询当前小区集合
     districtHasChanged(district) {
-      this.queryParams.areaId = null
-      this.queryParams.buildingId = null
-      this.queryParams.unitId = null
+      this.form.areaId = null
+      this.form.buildingId = null
+      this.form.unitId = null
       this.communityOptions = [];
       this.buildingOptions = [];
       this.unitOptions = [];
@@ -966,8 +808,8 @@ export default {
     },
     // 当前所选小区发生改变 查询当前楼栋集合
     communityHasChanged(areaId) {
-      this.queryParams.buildingId = null
-      this.queryParams.unitId = null
+      this.form.buildingId = null
+      this.form.unitId = null
       this.buildingOptions = [];
       this.unitOptions = [];
       this.houseOptions = [];
@@ -978,7 +820,7 @@ export default {
     buildingHasChanged(buildingId, areaId) {
       this.unitOptions = [];
       this.houseOptions = [];
-      this.queryParams.unitId = null
+      this.form.unitId = null
       getUnits(buildingId).then(res => {
         this.unitOptions = res.data
       })
@@ -990,6 +832,27 @@ export default {
         this.houseOptions = res.data
       })
     },
+    getAreaList(district) {
+      if (district === undefined || district == null || district === '')
+        return
+      getAreaList({district: district}).then(res => this.areaList = res.data)
+    },
+    getBuildingList1(areaId) {
+      if (areaId === undefined || areaId == null || areaId === '')
+        return
+      getBuildingList({areaId: areaId}).then(res => this.buildingList = res.data)
+    },
+    getUnitList1(buildingId) {
+      if (buildingId === undefined || buildingId == null || buildingId === '')
+        return
+      getUnits(buildingId).then(res => this.unitList = res.data)
+    },
+    getHouseList1(unitId) {
+      if (unitId === undefined || unitId == null || unitId === '')
+        return
+      getHouses(unitId).then(res => this.houseList = res.data)
+    },
+
     formatFormPic(picList){
       let list = []
       for (let i = 0; i < picList.length; i++) {
@@ -1365,6 +1228,7 @@ export default {
       this.title = "新增开栓施工";
       this.currentType = 'add'
       this.open = true;
+      this.buttonLoading=true;
     },
     removeFile(val) {
       console.log(val)
@@ -1373,6 +1237,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.buttonLoading=true;
       this.gc = false
       this.loading = true;
       this.reset();
@@ -1392,6 +1257,26 @@ export default {
       });
     },
 
+    /** 修改按钮操作 */
+    handleview(row) {
+      this.buttonLoading=false;
+      this.gc = false
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      putEngineeGasOpening(id).then(response => {
+        this.loading = false;
+        let newData = response.data
+        this.districtHasChanged(newData.district)
+        this.communityHasChanged(newData.areaId)
+        this.buildingHasChanged(newData.buildingId, newData.areaId)
+        this.unitHasChanged(newData.unitId)
+        this.form = response.data;
+        this.title = "查看开栓施工";
+        this.open = true;
+      });
+    },
+
     /** 提交按钮 */
     submitForm() {
       this.form.zEngineeringNodeBo = null

+ 9 - 5
src/views/zdsz/engineeringIndustry/index.vue

@@ -655,11 +655,15 @@ export default {
       if (type) {
         this.form.type = type;
         this.form.zEngineeringNodeBo.type = (type === '1' ? "工业工程" : "市政工程")
-        this.EngineepipeType = (type === '1' ? [{value: '小微商服', label: '小微商服'}, {
-            value: '新建工业',
-            label: '新建工业'
-          }, {value: '改造工业', label: '改造工业'}]
-          : [{value: '气源', label: '气源'}, {value: '排迁', label: '排迁'}])
+        this.EngineepipeType = (type === '1' ? [
+          {value: '小微商服', label: '小微商服'},
+          {value: '新建工业',label: '新建工业'},
+          {value: '改造工业', label: '改造工业'},
+          {value: '民用(庭院)', label: '民用(庭院)'}
+          ]: [
+            {value: '气源', label: '气源'}, {value: '排迁', label: '排迁'}
+          ]
+        )
       }
     },
     // 新增顶管工程