提交代码

src/components/EngineePipe/index.vue

@@ -430,7 +430,7 @@ export default {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.currentCheckList = []
-                this.getList();
+                this.$parent.getList();
               })
             }
           }})

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -7,7 +7,8 @@
 
 <template>
   <div class="app-container">
-    <el-form :model="queryParams1" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="110px" @submit.native.prevent>
+    <el-form :model="queryParams1" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="110px"
+             @submit.native.prevent>
       <el-form-item label="工程名称" prop="enginName">
         <el-input v-model="queryParams1.enginName" placeholder="请输入工程名称" clearable></el-input>
       </el-form-item>
@@ -27,7 +28,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['zdsz:engineeringPipeJacking:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -38,20 +40,21 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['zdsz:engineeringPipeJacking:remove']"
-        >删除</el-button>
+        >删除
+        </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 type="selection" width="55" align="center"/>
       <!--            <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="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="nodeReViewStateList" width="250">
         <template slot-scope="scope">
           <div style="text-align:center">
@@ -77,7 +80,7 @@
             size="mini"
             @click="viewSource(scope.row)"
           >历史</el-button> -->
-           <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
@@ -99,7 +102,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['zdsz:engineeringPipeJacking:edit']"
-          >修改工程信息</el-button>
+          >修改工程信息
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -122,7 +126,8 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['zdsz:engineeringPipeJacking:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -195,7 +200,8 @@
       </div>
     </el-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">
       <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>
@@ -272,7 +278,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-          <FileUpload ref="obsImageUpload" :limit="9999"  :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
+          <FileUpload ref="obsImageUpload" :limit="9999" :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
                       @input="getUrl"></FileUpload>
         </el-form-item>
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
@@ -312,14 +318,14 @@ import {getDicts} from "@/api/system/dict/data";
 
 export default {
   name: "openrepair",
-  components:{
+  components: {
     EngineePipe,
     ConstructionDetails
   },
-  dicts:['sys_yes_no','is_repair','engin_type','self_closing_valve_type','visit_type','pipe_jack'],
+  dicts: ['sys_yes_no', 'is_repair', 'engin_type', 'self_closing_valve_type', 'visit_type', 'pipe_jack'],
   data() {
     return {
-      currentCollapses:[],  // 当前节点历史数据
+      currentCollapses: [],  // 当前节点历史数据
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -340,169 +346,169 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      enginTypeOption:[
+      enginTypeOption: [
         {
-          value:'0',
-          label:'民用工程'
+          value: '0',
+          label: '民用工程'
         },
         {
-          value:'2',
-          label:'工业工程'
+          value: '2',
+          label: '工业工程'
         },
         {
-          value:'1',
-          label:'市政工程'
+          value: '1',
+          label: '市政工程'
         },
         {
-          value:'3',
-          label:'顶管工程'
+          value: '3',
+          label: '顶管工程'
         },
         {
-          value:'4',
-          label:'危险作业工程'
+          value: '4',
+          label: '危险作业工程'
         },
         {
-          value:'5',
-          label:'基建工程'
+          value: '5',
+          label: '基建工程'
         },
       ],
-      nodeType:'1',               // 节点类型
+      nodeType: '1',               // 节点类型
       // 查询参数
       queryParams1: {
-        enginName:'',
-        pageNum:1,
-        pageSize:10
+        enginName: '',
+        pageNum: 1,
+        pageSize: 10
       },
       queryParams: {
-        enginName:'',            // 工程名称
-        enginAddre:'',            // 工程地址
-        enginScale:'',           // 工程名称联系方式
-        enginCode:'',       // 工程编码
-        constructQuality:'',      // 施工质量
-        type:null,         // 工程类型
-        constructSchedule:"",       // 施工进度
-        enginType:'',             // 工程类型  民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
-        remark:'',                // 备注
-        zEngineeringNodeBo:{
-          type:null,
-          zEngineeringInfoBo:{},    //节点信息
+        enginName: '',            // 工程名称
+        enginAddre: '',            // 工程地址
+        enginScale: '',           // 工程名称联系方式
+        enginCode: '',       // 工程编码
+        constructQuality: '',      // 施工质量
+        type: null,         // 工程类型
+        constructSchedule: "",       // 施工进度
+        enginType: '',             // 工程类型  民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
+        remark: '',                // 备注
+        zEngineeringNodeBo: {
+          type: null,
+          zEngineeringInfoBo: {},    //节点信息
         }
       },
-      zEngineeringInfoBo:{
-        constructAddre:'',        // 施工地址
-        constructPhone:'',        // 施工人电话
-        constructUser:'',         // 施工人
-        headName:'',              // 负责人
-        headPhone:'',             // 负责人电话
-        constructAccordingDrawings:'', // 是否按图纸施工
-        segmentedCompressionQualified:'', // 分段打压是否合格
-        selfClosingValveType:'',          // 自闭阀类型
-        visitType:'',                     // 上门类型
-        backfillTime:'',                  // 回填时间
-        constructTime:'',                  // 施工时间
-        zEngiineeringPhotoBoList:[],              // 图片列表
-        zEngineeringMaterialBo:[],// 用料对象
+      zEngineeringInfoBo: {
+        constructAddre: '',        // 施工地址
+        constructPhone: '',        // 施工人电话
+        constructUser: '',         // 施工人
+        headName: '',              // 负责人
+        headPhone: '',             // 负责人电话
+        constructAccordingDrawings: '', // 是否按图纸施工
+        segmentedCompressionQualified: '', // 分段打压是否合格
+        selfClosingValveType: '',          // 自闭阀类型
+        visitType: '',                     // 上门类型
+        backfillTime: '',                  // 回填时间
+        constructTime: '',                  // 施工时间
+        zEngiineeringPhotoBoList: [],              // 图片列表
+        zEngineeringMaterialBo: [],// 用料对象
 
       },                          // 节点信息
-      constructAccordingDrawingsOption:[
+      constructAccordingDrawingsOption: [
         {
-          value:'1',
-          label:'是'
+          value: '1',
+          label: '是'
         },
         {
-          value:'0',
-          label:'否'
+          value: '0',
+          label: '否'
         }
       ],
-      segmentedCompressionQualifiedOption:[
+      segmentedCompressionQualifiedOption: [
         {
-          value:'1',
-          label:'是'
+          value: '1',
+          label: '是'
         },
         {
-          value:'0',
-          label:'否'
+          value: '0',
+          label: '否'
         }
       ],
-      nodeDetailVisible:false,
+      nodeDetailVisible: false,
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         areaId: [
-          { required: true, message: "小区不能为空", trigger: "change" }
+          {required: true, message: "小区不能为空", trigger: "change"}
         ],
         constructSchedule: [
-          { required: true, message: "施工进度不能为空" ,trigger: 'blur'}
+          {required: true, message: "施工进度不能为空", trigger: 'blur'}
         ],
         enginType: [
-          { required: true, message: "外建工程不能为空" ,trigger: 'blur'}
+          {required: true, message: "外建工程不能为空", trigger: 'blur'}
         ],
         constructQuality: [
-          { required: true, message: "建立联系电话不能为空" ,trigger: 'blur'}
+          {required: true, message: "建立联系电话不能为空", trigger: 'blur'}
         ],
         enginName: [
-          { required: true, message: "工程名称不能为空" ,trigger: 'blur'}
+          {required: true, message: "工程名称不能为空", trigger: 'blur'}
         ],
         enginAddre: [
-          { required: true, message: "工程地址不能为空" ,trigger: 'blur'}
+          {required: true, message: "工程地址不能为空", trigger: 'blur'}
         ],
         enginScale: [
-          { required: true, message: "联系方式不能为空" ,trigger: 'blur'}
+          {required: true, message: "联系方式不能为空", trigger: 'blur'}
         ],
         enginCode: [
-          { required: true, message: "工程编码不能为空" ,trigger: 'blur'}
+          {required: true, message: "工程编码不能为空", trigger: 'blur'}
         ],
         buildingId: [
-          { required: true, message: "楼栋不能为空", trigger: "change" }
+          {required: true, message: "楼栋不能为空", trigger: "change"}
         ],
         unitId: [
-          { required: true, message: "单元不能为空", trigger: "change" }
+          {required: true, message: "单元不能为空", trigger: "change"}
         ],
         houseId: [
-          { required: true, message: "房间不能为空", trigger: "change" }
+          {required: true, message: "房间不能为空", trigger: "change"}
         ],
         type: [
-          { required: false, message: "类型不能为空", trigger: "change" }
+          {required: false, message: "类型不能为空", trigger: "change"}
         ],
         isQualified: [
-          { required: true, message: "安检是否合格不能为空", trigger: "blur" }
+          {required: true, message: "安检是否合格不能为空", trigger: "blur"}
         ],
         remark: [
-          { required: false, message: "备注不能为空", trigger: "blur" }
+          {required: false, message: "备注不能为空", trigger: "blur"}
         ],
       },
       // 节点规则校验
-      nodeRules:{
+      nodeRules: {
         type: [
-          { required: true, message: "施工地址不能为空" ,trigger: 'blur'}
+          {required: true, message: "施工地址不能为空", trigger: 'blur'}
         ],
         constructAddre: [
-          { required: true, message: "施工地址不能为空" ,trigger: 'blur'}
+          {required: true, message: "施工地址不能为空", trigger: 'blur'}
         ],
         constructPhone: [
-          { required: true, message: "施工人电话不能为空" ,trigger: 'blur'}
+          {required: true, message: "施工人电话不能为空", trigger: 'blur'}
         ],
         constructUser: [
-          { required: true, message: "施工人不能为空" ,trigger: 'blur'}
+          {required: true, message: "施工人不能为空", trigger: 'blur'}
         ],
         headName: [
-          { required: true, message: "负责人不能为空" ,trigger: 'blur'}
+          {required: true, message: "负责人不能为空", trigger: 'blur'}
         ],
         headPhone: [
-          { required: true, message: "负责人电话不能为空" ,trigger: 'blur'}
+          {required: true, message: "负责人电话不能为空", trigger: 'blur'}
         ],
 
       },
-      currentType:null,
-      nodeList:[],
-      checkList:[],
-      currentCheckList:[],
-      enginNodeStatus:null,
-      status:null,
-      createTime:'',
-      enginId:null,
-      updateParams:{}
+      currentType: null,
+      nodeList: [],
+      checkList: [],
+      currentCheckList: [],
+      enginNodeStatus: null,
+      status: null,
+      createTime: '',
+      enginId: null,
+      updateParams: {}
     };
   },
   created() {
@@ -510,12 +516,12 @@ export default {
   },
   methods: {
     // 填写节点信息
-    updateNodeOption(zEngineeringInfoBoList){
+    updateNodeOption(zEngineeringInfoBoList) {
       delete this.updateParams.zEngineeringNodeBoList
       this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList
       putEngineeringPipeJacking(this.updateParams).then(res => {
         console.log(res)
-        if(res.code == 200){
+        if (res.code == 200) {
           this.$message({
             message: '修改成功',
             type: 'success'
@@ -527,12 +533,12 @@ export default {
       })
     },
     // 节点单项审核
-    checkWorking(checkingInfo){
+    checkWorking(checkingInfo) {
       let params = checkingInfo
       params.createTime = this.createTime
       // params.engInfoId = this.currentId
       insertReview(params).then(res => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.$message({
             message: '审核成功',
             type: 'success'
@@ -542,14 +548,16 @@ export default {
         }
       })
     },
-    async addNodeInfo(e){
+    async addNodeInfo(e) {
       this.nodeDetailType = '修改'
       this.currentId = e.id
       this.enginId = e.id
       this.status = 'put'
       let val = e.enginType + "_" + e.enginClassification
       const res = await getDicts('pipe_jack');
-      const r = res.data!=null?res.data.map(o=>{return {label:o.dictLabel,value:o.dictValue}}):[];
+      const r = res.data != null ? res.data.map(o => {
+        return {label: o.dictLabel, value: o.dictValue}
+      }) : [];
       this.$refs.ConstructionDetails.open(r)
       return
       getDicts(val).then(res => {
@@ -586,30 +594,32 @@ export default {
         // this.enginClassification = zEngineeringNodeBo.type
         // newData.zEngineeringNodeBo = zEngineeringNodeBo
         this.currentType = 'addMaterial'
-        console.log('顶管工程详情',res.data)
+        console.log('顶管工程详情', res.data)
         this.$refs.enginPipe.openDialog({
           id: data.id,
           type: '顶管工程'
-        }, 'addMaterial',res.data)
+        }, 'addMaterial', res.data)
         // this.open = true
 
       })
     },
     // 查看历史
-    async viewSource(e,type = null){
-      console.log('查看历史 type=',type)
+    async viewSource(e, type = null) {
+      console.log('查看历史 type=', type)
       const res = await getDicts('pipe_jack');
-      const r = res.data!=null?res.data.map(o=>{return {label:o.dictLabel,value:o.dictValue}}):[];
+      const r = res.data != null ? res.data.map(o => {
+        return {label: o.dictLabel, value: o.dictValue}
+      }) : [];
       this.currentId = e.id
       this.status = 'read-only'
-      console.log('__________',r)
-      this.$refs.ConstructionDetails.open(r,_,type,e,e.type)
+      console.log('__________', r)
+      this.$refs.ConstructionDetails.open(r, _, type, e, e.type)
     },
-    viewNodeSource(e){
-      console.log('查看历史传值',e,this.currentId)
+    viewNodeSource(e) {
+      console.log('查看历史传值', e, this.currentId)
       detailEngineeringPipeJacking({
-        id:this.currentId,
-        type:e
+        id: this.currentId,
+        type: e
       }).then(res => {
         console.log(res)
         this.createTime = res.data.createTime
@@ -623,24 +633,24 @@ export default {
         console.log(this.currentCollapses)
       })
     },
-    nodeCancel(){
+    nodeCancel() {
       this.nodeDetailVisible = false
     },
-    toNodeDetail(){
-      getDictList({enginType:['pipe_jack']}).then(res => {
+    toNodeDetail() {
+      getDictList({enginType: ['pipe_jack']}).then(res => {
         this.nodeList = res.data
       })
       this.nodeDetailVisible = true
       return
       this.$refs['form'].validate(e => {
-        if(e){
+        if (e) {
           this.nodeDetailVisible = true
         }
       })
 
     },
     getUrl(url) {
-      this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList?this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
+      this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
     },
     /** 查询开栓|安检|维修列表 */
     getList() {
@@ -672,13 +682,13 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams1.enginName=''
+      this.queryParams1.enginName = ''
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -710,8 +720,9 @@ export default {
       // return
       const id = row.id || this.ids;
       viewEngineeringPipeJacking(id).then(res => {
-        this.$refs.enginPipe.putEnginPipe(res.data,'put')
+        this.$refs.enginPipe.putEnginPipe(res.data, 'put')
       })
+
     },
     /** 提交按钮 */
     submitForm() {
@@ -750,52 +761,57 @@ export default {
 
 
 <style lang="scss" scoped>
-::v-deep .appendElDialog{
+::v-deep .appendElDialog {
   width: 70%;
   height: 80%;
 
 
-  .el-dialog__body{
+  .el-dialog__body {
     height: 85%;
   }
 
-  .el-form-item{
+  .el-form-item {
     margin-bottom: 22px;
     width: 44%;
     display: inline-block;
   }
-  .el-form-item:nth-child(2n+2){
+
+  .el-form-item:nth-child(2n+2) {
     margin-left: 5%;
   }
-  .el-form-item:not(:nth-child(1):nth-child(2)){
+
+  .el-form-item:not(:nth-child(1):nth-child(2)) {
     margin-top: 0.5%;
   }
-  .remark_input{
-    .el-textarea__inner{
+
+  .remark_input {
+    .el-textarea__inner {
       width: 238%;
       height: 190px;
     }
   }
 }
 
-::v-deep .appendElNodeDialog{
+::v-deep .appendElNodeDialog {
   // width: 70%;
   height: 80%;
 
 
-  .el-dialog__body{
+  .el-dialog__body {
     height: 85%;
   }
 
-  .el-form-item{
+  .el-form-item {
     margin-bottom: 22px;
     width: 44%;
     display: inline-block;
   }
-  .el-form-item:nth-child(2n+2){
+
+  .el-form-item:nth-child(2n+2) {
     margin-left: 5%;
   }
-  .el-form-item:not(:nth-child(1):nth-child(2)){
+
+  .el-form-item:not(:nth-child(1):nth-child(2)) {
     margin-top: 0.5%;
   }
 }