一节点多详情

src/components/EngineeNode/index.vue

@@ -1,9 +1,9 @@
 
- <!-- 
+ <!--
     *@description: 工程节点信息dialog
     *@author: yh Fu
     *@date: 2024-01-03 14:27:02
-    *@version: V1.0.5 
+    *@version: V1.0.5
 -->
 
 
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { 
+import {
     addEnginee,                                // 新增工业工程
     addEngineeringDangerous,                   // 新增危险作业工程
     addEngineeringPipeJacking,                 // 新增顶管工程
@@ -155,7 +155,7 @@ export default {
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -165,7 +165,7 @@ export default {
                 value:'0',
                 label:'否'
               }
-            ],  
+            ],
             currentType:null ,          // 民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
         }
     },
@@ -195,6 +195,7 @@ export default {
                         case 10 :
                             // 顶管新增
                             this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
+                          debugger
                             addEngineeringPipeJacking(this.params).then(res => {
                               if(res.code == 200){
                                 this.$message({
@@ -251,7 +252,7 @@ export default {
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }

src/views/zdsz/engineeringIndustry/index.vue

@@ -1,9 +1,9 @@
 
- <!-- 
+ <!--
     *@description: 工业工程
     *@author: yh Fu
     *@date: 2024-01-02 15:51:03
-    *@version: V1.0.5 
+    *@version: V1.0.5
     -->
 
     <template>
@@ -54,7 +54,7 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
-      
+
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
               <el-button
@@ -100,7 +100,7 @@
             <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
-      
+
           <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="id" v-if="true"/>-->
@@ -135,11 +135,12 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="addNewPipe(scope.row)"
+                  v-hasPermi="['zdsz:engineeringPipeJacking:add']"
                 >新增顶管工程</el-button>
               </template>
             </el-table-column>
           </el-table>
-      
+
           <pagination
             v-show="total>0"
             :total="total"
@@ -193,9 +194,9 @@
                 <el-input v-model="queryParams.supervisionUnit" placeholder="请填写监理单位"/>
               </el-form-item>
               <el-form-item label="备注" prop="remark">
-                <el-input 
-                  v-model="queryParams.remark" 
-                  type="textarea" 
+                <el-input
+                  v-model="queryParams.remark"
+                  type="textarea"
                   placeholder="请输入内容"
                   class="remark_input"
                   />
@@ -294,19 +295,19 @@
           </el-dialog>
         </div>
       </template>
-      
+
       <script>
       import { listComprehensive, getComprehensive, delComprehensive, addComprehensive, updateComprehensive } from "@/api/zdsz/comprehensive";
       import {getBuildings} from "@/api/zdsz/building";
       import {getUnits} from "@/api/zdsz/unit";
       import {getAreas} from "@/api/zdsz/area";
       import {getHouses, listHouse} from "@/api/zdsz/house";
-      import { 
+      import {
         getEngineeList,                            // 查询工程列表
         addEnginee,                                // 新增工程
       } from "@/api/zdsz/enginee"
       import EngineePipe from "@/components/EngineePipe"
-      
+
       export default {
         name: "openrepair",
         dicts:['pass_check','is_repair','engin_type','self_closing_valve_type','visit_type'],
@@ -417,7 +418,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -427,7 +428,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             nodeDetailVisible:false,
             // 表单参数
             form: {},
@@ -522,7 +523,7 @@
           // 新增顶管工程
           addNewPipe(data){
             this.$refs.enginPipe.openDialog({
-              id:data.id
+              id:data.id,type:'工业工程'
             },'add')
           },
           nodeCancel(){
@@ -536,7 +537,7 @@
                 this.nodeDetailVisible = true
               }
             })
-            
+
           },
           getUrl(url) {
             this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList?this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
@@ -674,7 +675,7 @@
               this.loading = false;
               this.form = response.data;
               this.form.picIds = response.data.mapList;
-      
+
               this.open = true;
               this.title = "修改维修";
             });
@@ -722,7 +723,7 @@
   width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -750,7 +751,7 @@
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -768,4 +769,3 @@
     }
 }
 </style>
-      

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -1,70 +1,23 @@
- <!-- 
+ <!--
     *@description: 顶管工程
     *@author: yh Fu
     *@date: 2024-01-04 09:24:57
-    *@version: V1.0.5 
+    *@version: V1.0.5
     -->
 
     <template>
         <div class="app-container">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
-            <el-form-item label="小区" prop="areaId">
-              <el-select v-model="queryParams.areaId" placeholder="请选择小区" filterable @change="getBuildings">
-                <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="queryParams.buildingId" placeholder="请选择楼栋" filterable @change="getUnits">
-                <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="queryParams.unitId" placeholder="请选择单元" filterable @change="getHouses">
-                <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="queryParams.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 label="工程名称" prop="enginName">
+              <el-input v-model="queryParams.enginName" placeholder="请输入工程名称"></el-input>
             </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>
             </el-form-item>
           </el-form>
-      
+
           <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['zdsz:openbolt:add']"
-              >新增</el-button>
-            </el-col> -->
             <el-col :span="1.5">
               <el-button
                 type="success"
@@ -73,7 +26,7 @@
                 size="mini"
                 :disabled="single"
                 @click="handleUpdate"
-                v-hasPermi="['zdsz:openbolt:edit']"
+                v-hasPermi="['zdsz:engineeringPipeJacking:edit']"
               >修改</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -84,34 +37,21 @@
                 size="mini"
                 :disabled="multiple"
                 @click="handleDelete"
-                v-hasPermi="['zdsz:openbolt:remove']"
+                v-hasPermi="['zdsz:engineeringPipeJacking:remove']"
               >删除</el-button>
             </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="warning"-->
-            <!--          plain-->
-            <!--          icon="el-icon-download"-->
-            <!--          size="mini"-->
-            <!--          @click="handleExport"-->
-            <!--          v-hasPermi="['zdsz:openbolt:export']"-->
-            <!--        >导出</el-button>-->
-            <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
-      
+
           <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="id" v-if="true"/>-->
-            <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="houseName" />
-            <el-table-column label="安检是否合格" align="center" prop="isQualified">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>
-              </template>
-            </el-table-column>
+            <el-table-column label="工程id" align="center" prop="enginId" />
+            <el-table-column label="工程名称" align="center" prop="enginName" />
+            <el-table-column label="工程编码" align="center" prop="enginCode" />
+            <el-table-column label="施工单位" align="center" prop="constructUnit" />
+            <el-table-column label="工程规模" align="center" prop="enginScale" />
+            <el-table-column label="施工质量" align="center" prop="constructQuality" />
+            <el-table-column label="施工进度" align="center" prop="constructSchedule" />
             <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -120,19 +60,19 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="['zdsz:comprehensive:edit']"
+                  v-hasPermi="['zdsz:engineeringPipeJacking:edit']"
                 >修改</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
-                  v-hasPermi="['zdsz:comprehensive:remove']"
+                  v-hasPermi="['zdsz:engineeringPipeJacking:remove']"
                 >删除</el-button>
               </template>
             </el-table-column>
           </el-table>
-      
+
           <pagination
             v-show="total>0"
             :total="total"
@@ -140,7 +80,7 @@
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
           />
-      
+
           <!-- 添加或修改开栓|安检|维修对话框 -->
           <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
             <el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
@@ -186,9 +126,9 @@
                 <el-input v-model="queryParams.constructSchedule" placeholder="请填写施工进度"/>
               </el-form-item>
               <el-form-item label="备注" prop="remark" style="width: 23.3%;">
-                <el-input 
-                  v-model="queryParams.remark" 
-                  type="textarea" 
+                <el-input
+                  v-model="queryParams.remark"
+                  type="textarea"
                   placeholder="请输入内容"
                   class="remark_input"
                   />
@@ -200,11 +140,11 @@
               <el-button @click="cancel">取 消</el-button>
             </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-input v-model="nodeType" placeholder="顶1管" disabled></el-input>
               </el-form-item>
               <el-form-item label="施工地址" prop="constructAddre">
                 <el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址"></el-input>
@@ -290,15 +230,14 @@
           <EngineePipe ref="enginPipe"/>
         </div>
       </template>
-      
+
       <script>
-      import { listComprehensive, getComprehensive, delComprehensive, addComprehensive, updateComprehensive } from "@/api/zdsz/comprehensive";
       import {getBuildings} from "@/api/zdsz/building";
       import {getUnits} from "@/api/zdsz/unit";
       import {getAreas} from "@/api/zdsz/area";
-      import {getHouses, listHouse} from "@/api/zdsz/house";
+      import {delHouse, getHouses, listHouse} from "@/api/zdsz/house";
       import EngineePipe from "@/components/EngineePipe"
-      import { 
+      import {
         getEngineeList,                            // 查询工程列表
         addEnginee,                                // 新增工程
         getPipeJackingList,                        // 顶管工程列表
@@ -306,7 +245,7 @@
         viewEngineeringPipeJacking,                // 顶管工程查看详情
         deleteEngineeringPipeJacking,              // 删除工程查看详情
       } from "@/api/zdsz/enginee"
-      
+
       export default {
         name: "openrepair",
         components:{
@@ -314,17 +253,6 @@
         },
         dicts:['pass_check','is_repair','engin_type','self_closing_valve_type','visit_type'],
         data() {
-            var validatePass = (rule, value, callback) => {
-                console.log('校验值', value)
-                if (value === '') {
-                    callback(new Error('请输入密码'));
-                } else {
-                if (this.ruleForm.checkPass !== '') {
-                    this.$refs.ruleForm.validateField('checkPass');
-                }
-                    callback();
-                }
-            };
           return {
             // 按钮loading
             buttonLoading: false,
@@ -375,20 +303,17 @@
             nodeType:'1',               // 节点类型
             // 查询参数
             queryParams: {
-              type:null,           // 外建工程
               enginName:'',            // 工程名称
-              type:'',           // 施工单位
               enginAddre:'',            // 工程地址
               enginScale:'',           // 工程名称联系方式
               enginCode:'',       // 工程编码
               constructQuality:'',      // 施工质量
-              type:'',         // 工程类型
+              type:null,         // 工程类型
               constructSchedule:"",       // 施工进度
-              type:'01',                // 类型  01工业工程 02市政工程
               enginType:'',             // 工程类型  民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
               remark:'',                // 备注
               zEngineeringNodeBo:{
-                type:'01',
+                type:null,
                 zEngineeringInfoBo:{},    //节点信息
               }
             },
@@ -417,7 +342,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -427,23 +352,15 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             nodeDetailVisible:false,
             // 表单参数
             form: {},
-            areas: [],
-            builds: [],
-            units: [],
-            rooms: [],
-            houses: [],
             // 表单校验
             rules: {
               areaId: [
                 { required: true, message: "小区不能为空", trigger: "change" }
               ],
-              type: [
-                { required: true, message: "外建工程不能为空" ,trigger: 'blur'}
-              ],
               constructSchedule: [
                 { required: true, message: "施工进度不能为空" ,trigger: 'blur'}
               ],
@@ -453,12 +370,6 @@
               constructQuality: [
                 { required: true, message: "建立联系电话不能为空" ,trigger: 'blur'}
               ],
-              type: [
-                { required: true, message: "工程类型不能为空" ,trigger: 'blur'}
-              ],
-              type: [
-                { required: true, message: "施工单位不能为空" ,trigger: 'blur'}
-              ],
               enginName: [
                 { required: true, message: "工程名称不能为空" ,trigger: 'blur'}
               ],
@@ -529,82 +440,17 @@
                 this.nodeDetailVisible = true
               }
             })
-            
+
           },
           getUrl(url) {
             this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList?this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
           },
-          getBuildings(id) {
-            this.units = []
-            this.houses = []
-            this.queryParams.buildingId = undefined
-            this.queryParams.unitId = undefined
-            this.queryParams.houseId = undefined
-            getBuildings(id).then(res => {
-              this.builds = res.data
-            })
-          },
-          getUnits(id) {
-            this.houses = []
-            this.queryParams.unitId = undefined
-            this.queryParams.houseId = undefined
-            getUnits(this.queryParams.areaId,id).then(res => {
-              this.units = res.data
-            })
-          },
-          getAreas() {
-            this.builds = []
-            this.units = []
-            this.houses = []
-            this.queryParams.buildingId = undefined
-            this.queryParams.unitId = undefined
-            this.queryParams.houseId = undefined
-            this.form.buildingId = undefined
-            this.form.unitId = undefined
-            this.form.houseId = undefined
-            getAreas().then(res => {
-              this.areas = res.data;
-            });
-          },
-          getHouses() {
-            this.houses = []
-            this.queryParams.houseId = undefined
-            getHouses(this.queryParams.unitId).then(res => {
-              this.houses = res.data;
-            });
-          },
-          getBuildings1(id) {
-            this.units = []
-            this.houses = []
-            this.form.buildingId = undefined
-            this.form.unitId = undefined
-            this.form.houseId = undefined
-            getBuildings(id).then(res => {
-              this.builds = res.data
-            })
-          },
-          getUnits1(id) {
-            this.houses = []
-            this.form.unitId = undefined
-            this.form.houseId = undefined
-            getUnits(this.form.areaId,id).then(res => {
-              this.units = res.data
-            })
-          },
-          getHouses1() {
-            this.houses = []
-            this.form.houseId = undefined
-            getHouses(this.form.unitId).then(res => {
-              this.houses = res.data;
-            });
-          },
           /** 查询开栓|安检|维修列表 */
           getList() {
             this.loading = true;
             getPipeJackingList({
               enginName:''
             }).then(res => {
-              console.log(res)
               this.comprehensiveList = res.rows;
               this.total = res.total;
               this.loading = false;
@@ -614,9 +460,6 @@
           cancel() {
             this.open = false;
             this.reset();
-            this.houses = []
-            this.units = []
-            this.builds = []
           },
           // 表单重置
           reset() {
@@ -652,7 +495,6 @@
           /** 修改按钮操作 */
           handleUpdate(row) {
             viewEngineeringPipeJacking(row.id).then(res => {
-              console.log(res)
               this.$refs.enginPipe.putEnginPipe(res.data,'put')
             })
           },
@@ -661,22 +503,29 @@
             // this.$refs["nodeForm"].validate(valid => {
               // if (valid) {
                 this.queryParams.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
-                console.log(this.queryParams)
                 addEnginee(this.queryParams).then(res => {
-                  console.log(res)
                 })
               // }
             // });
           },
           /** 删除按钮操作 */
           handleDelete(row) {
-            deleteEngineeringPipeJacking(row.id).then(res => {
-              console.log(res)
-            })
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除选择数据项？').then(() => {
+              this.loading = true;
+              return deleteEngineeringPipeJacking(ids);
+            }).then(() => {
+              this.loading = false;
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {
+            }).finally(() => {
+              this.loading = false;
+            });
           },
           /** 导出按钮操作 */
           handleExport() {
-            this.download('zdsz/openbolt/export', {
+            this.download('zdsz/engineeringPipeJacking/export', {
               ...this.queryParams
             }, `comprehensive_${new Date().getTime()}.xlsx`)
           }
@@ -690,7 +539,7 @@
   width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -718,7 +567,7 @@
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -736,4 +585,3 @@
     }
 }
 </style>
-