Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/api/zdsz/engineeringIndustry.js

@@ -0,0 +1,41 @@
+import request from "@/utils/request";
+
+export function getEngineeIndustryList({type, enginType ='',}) {
+  return request({
+    url: `/zdsz/engineeringIndustry/list?type=${type}&enginType=${enginType}`,
+    method: 'get',
+  })
+}
+
+export function addEngineeEngineeIndustry(data) {
+  return request({
+    url: '/zdsz/engineeringIndustry',
+    method: 'post',
+    data
+  })
+}
+
+export function putEngineeEngineeIndustry(id) {
+  return request({
+    url: `/zdsz/engineeringIndustry/${id}`,
+    method: 'get',
+
+  })
+}
+
+export function EditEngineeEngineeIndustry(data) {
+  return request({
+    url: '/zdsz/engineeringIndustry',
+    method: 'put',
+    data
+  })
+}
+
+export function DelEngineeEngineeIndustry(id) {
+  return request({
+    url: `/zdsz/engineeringIndustry/${id}`,
+    method: 'delete',
+  })
+}
+
+

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
 -->
 
 
@@ -158,7 +158,7 @@
 </template>
 
 <script>
-import { 
+import {
     addEnginee,                                // 新增工业工程
     addEngineeringDangerous,                   // 新增危险作业工程
     addEngineeringPipeJacking,                 // 新增顶管工程
@@ -222,7 +222,7 @@ export default {
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -232,7 +232,7 @@ export default {
                 value:'0',
                 label:'不合格'
               }
-            ],  
+            ],
             currentType:null ,          // 民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
             drawer: false,
             direction: 'rtl',
@@ -313,6 +313,7 @@ export default {
                         case 10 :
                             // 顶管新增
                             this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
+                          debugger
                             addEngineeringPipeJacking(this.params).then(res => {
                               if(res.code == 200){
                                 this.$message({
@@ -429,7 +430,7 @@ export default {
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }

src/views/zdsz/engineeringIndustry/index.vue

@@ -1,51 +1,24 @@
 
- <!-- 
+ <!--
     *@description: 工业工程
     *@author: yh Fu
     *@date: 2024-01-02 15:51:03
-    *@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 label="建筑单位" prop="unitId">
+              <el-input v-model="queryParams.constructUnit" placeholder="请输入建筑单位名称"></el-input>
             </el-form-item>
-            <el-form-item label="单元" prop="unitId">
-              <el-select v-model="queryParams.unitId" placeholder="请选择单元" filterable @change="getHouses">
+            <el-form-item label="工程类型" prop="houseId">
+              <el-select v-model="queryParams.enginType" placeholder="请选择类型">
                 <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"
+                  v-for="e in dict.type.engin_type"
+                  :key="e.value"
+                  :label="e.label"
+                  :value="e.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -54,7 +27,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
@@ -63,7 +36,7 @@
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAdd"
-                v-hasPermi="['zdsz:openbolt:add']"
+                v-hasPermi="['zdsz:engineeringIndustry:add']"
               >新增</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -74,7 +47,7 @@
                 size="mini"
                 :disabled="single"
                 @click="handleUpdate"
-                v-hasPermi="['zdsz:openbolt:edit']"
+                v-hasPermi="['zdsz:engineeringIndustry:edit']"
               >修改</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -85,7 +58,7 @@
                 size="mini"
                 :disabled="multiple"
                 @click="handleDelete"
-                v-hasPermi="['zdsz:openbolt:remove']"
+                v-hasPermi="['zdsz:engineeringIndustry:remove']"
               >删除</el-button>
             </el-col>
             <!--      <el-col :span="1.5">-->
@@ -100,20 +73,17 @@
             <!--      </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="备注" align="center" prop="remark" show-overflow-tooltip/>
+            <el-table-column label="建筑单位" align="center" prop="constructUnit" />
+            <el-table-column label="项目负责人" align="center" prop="projectHead" />
+            <el-table-column label="现场负责人" align="center" prop="sceneHead" />
+            <el-table-column label="设计负责人" align="center" prop="designHead" />
+            <el-table-column label="设计单位" align="center" prop="designUnit" />
+            <el-table-column label="监理负责人" align="center" prop="supervisionHead" />
+            <el-table-column label="监理单位" align="center" prop="supervisionUnit" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -121,14 +91,14 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="['zdsz:comprehensive:edit']"
+                  v-hasPermi="['zdsz:engineeringIndustry: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:engineeringIndustry:remove']"
                 >删除</el-button>
                 <el-button
                   size="mini"
@@ -139,7 +109,7 @@
               </template>
             </el-table-column>
           </el-table>
-      
+
           <pagination
             v-show="total>0"
             :total="total"
@@ -151,33 +121,33 @@
           <EngineePipe ref="enginPipe"/>
           <!-- 添加或修改开栓|安检|维修对话框 -->
           <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
-            <el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px">
               <el-form-item label="现场负责人" prop="sceneHead">
-                <el-input v-model="queryParams.sceneHead" placeholder="请填写现场负责人"></el-input>
+                <el-input v-model="form.sceneHead" placeholder="请填写现场负责人"></el-input>
               </el-form-item>
               <el-form-item label="设计负责人" prop="designHead">
-                <el-input v-model="queryParams.designHead" placeholder="请填写现场负责人"></el-input>
+                <el-input v-model="form.designHead" placeholder="请填写现场负责人"></el-input>
               </el-form-item>
               <el-form-item label="设计单位" prop="designUnit">
-                <el-input v-model="queryParams.designUnit" placeholder="请填写设计单位"></el-input>
+                <el-input v-model="form.designUnit" placeholder="请填写设计单位"></el-input>
               </el-form-item>
               <el-form-item label="监理负责人" prop="supervisionHead">
-                <el-input v-model="queryParams.supervisionHead" placeholder="请填写监理负责人"></el-input>
+                <el-input v-model="form.supervisionHead" placeholder="请填写监理负责人"></el-input>
               </el-form-item>
               <el-form-item label="项目负责人" prop="projectHead">
-                <el-input v-model="queryParams.projectHead" placeholder="请填写项目负责人"></el-input>
+                <el-input v-model="form.projectHead" placeholder="请填写项目负责人"></el-input>
               </el-form-item>
               <el-form-item label="设计联系方式" prop="designPhone">
-                <el-input v-model="queryParams.designPhone" placeholder="请填写联系方式"></el-input>
+                <el-input v-model="form.designPhone" placeholder="请填写联系方式"></el-input>
               </el-form-item>
               <el-form-item label="监理联系电话" prop="supervisionPhone">
-                <el-input v-model="queryParams.supervisionPhone" placeholder="请填写联系方式"></el-input>
+                <el-input v-model="form.supervisionPhone" placeholder="请填写联系方式"></el-input>
               </el-form-item>
               <el-form-item label="建筑单位" prop="constructUnit">
-                <el-input v-model="queryParams.constructUnit" placeholder="请填写建筑单位"></el-input>
+                <el-input v-model="form.constructUnit" placeholder="请填写建筑单位"></el-input>
               </el-form-item>
-              <el-form-item label="类型" prop="enginTyoe">
-                <el-select v-model="queryParams.enginType" placeholder="请选择类型">
+              <el-form-item label="类型" prop="enginType">
+                <el-select v-model="form.enginType" placeholder="请选择类型">
                   <el-option
                     v-for="e in dict.type.engin_type"
                     :key="e.value"
@@ -190,12 +160,12 @@
                 <el-input v-model="queryParams.type" placeholder="工业工程" disabled/>
               </el-form-item> -->
               <el-form-item label="监理单位" prop="supervisionUnit">
-                <el-input v-model="queryParams.supervisionUnit" placeholder="请填写监理单位"/>
+                <el-input v-model="form.supervisionUnit" placeholder="请填写监理单位"/>
               </el-form-item>
               <el-form-item label="备注" prop="remark">
-                <el-input 
-                  v-model="queryParams.remark" 
-                  type="textarea" 
+                <el-input
+                  v-model="form.remark"
+                  type="textarea"
                   placeholder="请输入内容"
                   class="remark_input"
                   />
@@ -208,10 +178,10 @@
             </div>
           </el-dialog>
           <!-- 节点信息dialog -->
-          <el-dialog :visible="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body customClass="appendElNodeDialog">
+          <el-dialog :visible="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body customClass="appendElNodeDialog" @close="nodeCancel">
             <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="zEngineeringInfoBo.type" placeholder="请填写节点类型" disabled></el-input>
               </el-form-item>
               <el-form-item label="施工地址" prop="constructAddre">
                 <el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址"></el-input>
@@ -294,19 +264,18 @@
           </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 { 
-        getEngineeList,                            // 查询工程列表
-        addEnginee,                                // 新增工程
-      } from "@/api/zdsz/enginee"
+      import {
+        getEngineeIndustryList,                            // 查询工程列表
+        addEngineeEngineeIndustry,                         // 新增工程
+        putEngineeEngineeIndustry,                         // 查询工程详情
+        EditEngineeEngineeIndustry,                        // 修改工程
+        DelEngineeEngineeIndustry                          // 删除工程
+      } from "@/api/zdsz/engineeringIndustry"
       import EngineePipe from "@/components/EngineePipe"
-      
+      import {addEnginee} from "@/api/zdsz/enginee";
+
       export default {
         name: "openrepair",
         dicts:['pass_check','is_repair','engin_type','self_closing_valve_type','visit_type'],
@@ -372,7 +341,6 @@
                 label:'基建工程'
               },
             ],
-            nodeType:'1',               // 节点类型
             // 查询参数
             queryParams: {
               sceneHead:null,           // 现场负责人
@@ -384,15 +352,16 @@
               supervisionPhone:'',      // 监理联系电话
               constructUnit:'',         // 建筑单位
               supervisionUnit:"",       // 监理单位
-              type:'01',                // 类型  01工业工程 02市政工程
+              type:'1',                // 类型  1工业工程 2市政工程
               enginType:'',             // 工程类型  民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
               remark:'',                // 备注
               zEngineeringNodeBo:{
-                type:'01',
+                type:'',
                 zEngineeringInfoBo:{},    //节点信息
               }
             },
             zEngineeringInfoBo:{
+              type:'',               // 节点类型
               constructAddre:'',        // 施工地址
               constructPhone:'',        // 施工人电话
               constructUser:'',         // 施工人
@@ -404,7 +373,6 @@
               constructTime:'',                  // 施工时间
               zEngiineeringPhotoBoList:[],              // 图片列表
               zEngineeringMaterialBo:[],// 用料对象
-
             },                          // 节点信息
             constructAccordingDrawingsOption:[
               {
@@ -415,7 +383,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -425,7 +393,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             nodeDetailVisible:false,
             // 表单参数
             form: {},
@@ -446,7 +414,7 @@
                 { required: true, message: "监理单位不能为空" ,trigger: 'blur'}
               ],
               enginType: [
-                { required: true, message: "现场负责人不能为空" ,trigger: 'blur'}
+                { required: true, message: "工程类型不能为空" ,trigger: 'blur'}
               ],
               supervisionPhone: [
                 { required: true, message: "建立联系电话不能为空" ,trigger: 'blur'}
@@ -491,7 +459,7 @@
             // 节点规则校验
             nodeRules:{
               type: [
-                { required: true, message: "施工地址不能为空" ,trigger: 'blur'}
+                { required: true, message: "节点类型不能为空" ,trigger: 'blur'}
               ],
               constructAddre: [
                 { required: true, message: "施工地址不能为空" ,trigger: 'blur'}
@@ -514,100 +482,44 @@
         },
         created() {
           this.getList();
-          // this.getAreas();
+          // 根据url获取type节点类型
+          this.getType();
         },
         methods: {
+          // 根据url获取type节点类型
+          getType() {
+            const queryString = window.location.search;
+            const params = new URLSearchParams(queryString);
+            const type = params.get('type');
+            if (type) {
+              this.zEngineeringInfoBo.type = type;
+              this.form.type = type;
+            }
+          },
           // 新增顶管工程
           addNewPipe(data){
             this.$refs.enginPipe.openDialog({
-              id:data.id
+              id:data.id,type:'工业工程'
             },'add')
           },
           nodeCancel(){
             this.nodeDetailVisible = false
           },
           toNodeDetail(){
-            this.nodeDetailVisible = true
-            return
-            this.$refs['form'].validate(e => {
-              if(e){
+            this.$refs["form"].validate(valid => {
+              if (valid) {
                 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;
-            getEngineeList({
-              type:'01'
+            getEngineeIndustryList({
+              type: this.form.type
             }).then(res => {
               console.log(res)
               this.comprehensiveList = res.rows;
@@ -619,9 +531,6 @@
           cancel() {
             this.open = false;
             this.reset();
-            this.houses = []
-            this.units = []
-            this.builds = []
           },
           // 表单重置
           reset() {
@@ -656,45 +565,52 @@
           },
           /** 修改按钮操作 */
           handleUpdate(row) {
-            getBuildings(row.areaId).then(res => {
-              this.builds = res.data
-            });
-            getUnits(row.areaId,row.buildingId).then(res => {
-              this.units = res.data
-            })
-            getHouses(row.unitId).then(res => {
-              this.houses = res.data;
-            });
             this.loading = true;
             this.reset();
             const id = row.id || this.ids
-            getComprehensive(id).then(response => {
+            putEngineeEngineeIndustry(id).then(response => {
               this.loading = false;
               this.form = response.data;
-              this.form.picIds = response.data.mapList;
-      
+              this.zEngineeringInfoBo =response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
               this.open = true;
-              this.title = "修改维修";
+              this.title = "修改工程";
             });
           },
           /** 提交按钮 */
           submitForm() {
-            // 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)
-                })
-              // }
-            // });
+            this.$refs["nodeForm"].validate(valid => {
+              if (valid) {
+                if (this.form.id == null){
+                  console.log(this.form)
+                  this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
+                  this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
+                  this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
+                  addEngineeEngineeIndustry(this.form).then(res => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.nodeDetailVisible = false
+                    this.getList();
+                  })
+                }else {
+                  this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
+                  this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
+                  this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
+                  EditEngineeEngineeIndustry(this.form).then(res=>{
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.nodeDetailVisible = false
+                    this.getList();
+                  })
+                }
+              }
+            });
           },
           /** 删除按钮操作 */
           handleDelete(row) {
             const ids = row.id || this.ids;
             this.$modal.confirm('是否确认删除维修为"' + ids + '"的数据项？').then(() => {
               this.loading = true;
-              return delComprehensive(ids);
+              return DelEngineeEngineeIndustry(ids);
             }).then(() => {
               this.loading = false;
               this.getList();
@@ -706,12 +622,78 @@
           },
           /** 导出按钮操作 */
           handleExport() {
-            this.download('zdsz/openbolt/export', {
+            this.download('zdsz/engineeringIndustry/export', {
               ...this.queryParams
             }, `comprehensive_${new Date().getTime()}.xlsx`)
           }
         }
       };
+
+
+      // 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;
+      //   });
+      // },
       </script>
 
 
@@ -720,7 +702,7 @@
   width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -748,7 +730,7 @@
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -766,4 +748,4 @@
     }
 }
 </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,23 +230,16 @@
           <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 EngineePipe from "@/components/EngineePipe"
-      import { 
-        getEngineeList,                            // 查询工程列表
+      import {
         addEnginee,                                // 新增工程
         getPipeJackingList,                        // 顶管工程列表
-        putEngineeringPipeJacking,                 // 顶管工程修改
         viewEngineeringPipeJacking,                // 顶管工程查看详情
         deleteEngineeringPipeJacking,              // 删除工程查看详情
       } from "@/api/zdsz/enginee"
-      
+
       export default {
         name: "openrepair",
         components:{
@@ -314,17 +247,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 +297,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 +336,7 @@
                 value:'0',
                 label:'否'
               }
-            ],                          
+            ],
             segmentedCompressionQualifiedOption:[
               {
                 value:'1',
@@ -427,23 +346,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 +364,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 +434,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 +454,6 @@
           cancel() {
             this.open = false;
             this.reset();
-            this.houses = []
-            this.units = []
-            this.builds = []
           },
           // 表单重置
           reset() {
@@ -652,7 +489,6 @@
           /** 修改按钮操作 */
           handleUpdate(row) {
             viewEngineeringPipeJacking(row.id).then(res => {
-              console.log(res)
               this.$refs.enginPipe.putEnginPipe(res.data,'put')
             })
           },
@@ -661,22 +497,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 +533,7 @@
   width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -718,7 +561,7 @@
   // width: 70%;
   height: 80%;
 
-    
+
     .el-dialog__body{
       height: 85%;
     }
@@ -736,4 +579,3 @@
     }
 }
 </style>
-