Revert "202406市政增删改查"

This reverts commit 1b583c50d4ecdbf6f0533b098233fb9cdcc1a994.

src/api/zdsz/engineeringIndustry.js

@@ -1,7 +1,14 @@
 import request from '@/utils/request'
 
+// 根据url直接获取type
+function getTypeFromUrl(url) {
+  // 使用正则表达式或其他方法从 URL 中提取 type 参数
+  const params = new URLSearchParams(url.split('?')[1]);
+  return params.get('type');
+}
 
 export function getEngineeIndustryList(sata) {
+  sata.type = getTypeFromUrl(window.location.href)
   return request({
     url: `/zdsz/engineeringIndustry/list`,
     method: 'get',

src/views/zdsz/engineeringIndustry/index.vue

@@ -13,14 +13,24 @@
         <el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>
           <el-option
             v-for="dict in EngineepipeType"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            :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-input v-model="searchParams.enginName" placeholder="请输入建筑工程名称" maxlength="20"></el-input>
+      </el-form-item>
+      <el-form-item label="工程分类" prop="enginClassification" v-if="engineeType">
+        <el-select v-model="searchParams.enginClassification" placeholder="请选择工程分类">
+          <el-option
+            v-for="e in dict.type.engin_classification"
+            :key="e.value"
+            :label="e.label"
+            :value="e.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -72,6 +82,7 @@
       <el-table-column label="工程名称" align="center" prop="enginName"/>
       <el-table-column label="工程类型" align="center" prop="enginType"/>
       <el-table-column label="工程名称" align="center" prop="enginName"/>
+      <el-table-column label="工程分类" align="center" prop="enginClassification"/>
       <el-table-column label="现场负责人" align="center" prop="sceneHead"/>
       <el-table-column label="设计负责人" align="center" prop="designHead"/>
       <el-table-column label="监理负责人" align="center" prop="supervisionHead"/>
@@ -113,6 +124,7 @@
           <el-button type="text"
                      icon="el-icon-edit"
                      size="mini"
+                     v-if="false"
                      v-hasPermi="['zdsz:engineeringIndustry:add']"
                      @click="addzEngineeringMaterBo(scope.row)"
           >添加用料
@@ -146,8 +158,7 @@
             icon="el-icon-download"
             size="mini"
             @click="download(scope.row.enginName)"
-          >下载图片
-          </el-button>
+          >下载图片</el-button>
           <el-button
             size="mini"
             type="text"
@@ -167,61 +178,58 @@
       :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">
         <el-form-item label="工程名称" prop="enginName">
-          <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"
-                    :readonly="title == '添加用料' "></el-input>
+          <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"></el-input>
         </el-form-item>
         <el-form-item label="建筑单位" prop="constructUnit">
-          <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "/>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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"
-                    :readonly="title == '添加用料' "></el-input>
+          <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%"
-                     :disabled="title == '添加用料' ">
+          <el-select v-model="form.enginType" placeholder="请选择工程类型" style="width: 100%">
             <el-option
               v-for="e in EngineepipeType"
-              :key="e.dictValue"
-              :label="e.dictLabel"
-              :value="e.dictValue"
+              :key="e.value"
+              :label="e.label"
+              :value="e.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工程分类" prop="enginClassification" v-if="form.type === '1'">
+          <el-select v-model="form.enginClassification" placeholder="请选择工程分类" multiple style="width: 100%">
+            <el-option
+              v-for="e in dict.type.engin_classification"
+              :key="e.value"
+              :label="e.label"
+              :value="e.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -232,7 +240,6 @@
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
                              :limit="9999"
                              :value="form.pics"
-                             :disabled="title == '添加用料' "
                              @input="filesUpload"
               ></ObsFileUpload>
             </el-form-item>
@@ -240,50 +247,18 @@
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
                              :limit="9999"
-                             :disabled="title == '添加用料' "
                              :value="form.files"
                              @input="filesUpload"
               ></ObsFileUpload>
             </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row v-if="title=='添加用料'">
-          <el-col :span="24">
-            <el-form-item label="环节">
-              <el-checkbox-group v-model="currentCheckList">
-                <el-checkbox
-                  :disabled=enginNodeStatusExecuted(item)
-                  :label="item.dictValue"
-                  v-for="item in nodeList"
-                  :key="item"
-                ></el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <EnginNodeInfo
-          v-if="title=='添加用料'"
-          v-for="(e,idx) in currentCheckList"
-          :key="idx"
-          :name="e"
-          :ref="'EnginNodeInfo'+idx"
-          :types="currentCheckList"
-          :currentContain="currentCheckList"
-          :enginType="'市政工程'"
-          :enginSort="form.enginType"
-        />
-
-        <div style="width: 25%; float: right" v-if="title=='添加用料'">
-          <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">提交</el-button>
-        </div>
-        <div style="width: 25%; float: right" v-else>
+        <div style="width: 25%; float: right">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-form>
     </el-dialog>
-
     <!-- 施工信息dialog -->
     <el-dialog :visible.sync="nodeDetailVisible" title="施工信息" append-to-body customClass="appendElNodeDialog"
                width="70% !important">
@@ -367,7 +342,6 @@
         </div>
       </el-form>
     </el-dialog>
-
     <ConstructionDetails
       ref="ConstructionDetails"
       :status="status"
@@ -375,9 +349,8 @@
       :zEngineeringNodeBo="zEngineeringNodeBo"
       @updateNodeOption="updateNodeOption"
       @checkWorking="checkWorking"
-      :enginType="'市政工程'"
+      :enginType="this.$route.query.type == '1' ? '工业工程' : '市政工程'"
     />
-
   </div>
 </template>
 <script>
@@ -391,21 +364,21 @@ import {
 } from '@/api/zdsz/engineeringIndustry'
 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 {
-  getDictList,
   getEnginMaterialQualityList,
-  insertReview, putEngineeringCivil,
+  insertReview,
+  engineeringCivilReview,
+  downloadZip,
+  downloadZipForSZ
 } from '@/api/zdsz/enginee'
 import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
-import EnginNodeInfo from "@/components/EnginNodeInfo/index.vue";
-import {addEngineeringCivil} from "@/api/zdsz/engineeringCivil";
 
 export default {
-  name: "市政",
-  dicts: [],
+  name: "openrepair",
+  dicts: ['sys_yes_no', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification', 'engineering_infrastructure'],
   components: {
-    EnginNodeInfo,
     ConstructionDetails,
     EngineePipe
   },
@@ -476,6 +449,7 @@ export default {
         supervisionUnit: '', // 监理单位
         supervisionHead: '', // 监理负责人
         supervisionPhone: '', // 监理联系电话
+        enginClassification: [], // 工程分类
         zEngineeringNodeBo: { // 工程节点
           type: '', // 节点类型
           zEngineeringInfoBo: { // 施工信息
@@ -515,12 +489,21 @@ export default {
         enginName: [
           {required: true, message: "工程名称不能为空", trigger: 'blur'}
         ],
+        enginClassification: [
+          {required: true, message: "工程分类不能为空", trigger: 'blur'}
+        ],
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: 'blur'}
         ],
         constructUnit: [
           {required: true, message: "建筑单位不能为空", trigger: 'blur'}
         ],
+        type: [
+          {required: false, message: "类型不能为空", trigger: "blur"}
+        ],
+        files: [
+          {required: true, message: "至少上传一个附件", trigger: "blur"}
+        ],
       },
       // 节点规则校验
       nodeRules: {
@@ -535,29 +518,31 @@ export default {
         pageSize: 10,
         pageNum: 1,
         enginName: null,             // 工程名称
+        enginClassification: null,   // 工程分类
       },
       currentType: null, // 附件组件类型 put修改 add新增
-      dictArr: [],
-      currentCheckingEnginList: [],
-      currentCheckList: [],
+      dictArr: []
     };
   },
   created() {
-    //工程分类
+    // 根据url获取type节点类型
     this.getType();
-    //列表
+    if (this.form.type === '2') {
+      this.engineeType = false
+    }
     this.getList();
+    this.changeNames();
   },
   mounted() {
     // 获取材质
-    getEnginMaterialQualityList({enginType: '市政工程'}).then(res => {
+    getEnginMaterialQualityList({enginType: this.$route.query.type == '1' ? '工业工程' : '市政工程'}).then(res => {
       this.materialQualityList = res.data
     });
   },
   methods: {
-    download(name) {
+    download(name){
       // downloadZipForSZ(this.form.type=='1'?'工业工程':'市政工程',name)
-      this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/${this.form.type == '1' ? '工业工程' : '市政工程'}/${name}`, name);
+        this.$download.zip(`/zdsz/engineeringPipeJacking/downloadZip/${this.form.type=='1'?'工业工程':'市政工程'}/${name}`, name);
     },
     changName(val) {
       if (this.form.type == '1')
@@ -565,41 +550,43 @@ export default {
       let obj = this.dictArr.find(o => o.dictValue == val)
       return obj ? obj.dictLabel : ''
     },
+    changeNames() {
+      getDicts('municipal_engineering_node').then(res => {
+        this.dictArr = res.data
+      })
+    },
     // 节点单项审核
     checkWorking(checkingInfo) {
       console.log('checkingInfo===', checkingInfo)
-
       function existsImg(arr) {
         return arr != null && arr.length > 0;
       }
-
-      function forInImg(arr, list) {
-        arr.forEach(o => {
+      function forInImg(arr,list) {
+        arr.forEach(o=>{
           list.push(o)
         })
         return list;
       }
-
-      if (this.form.type == '2') {
-        checkingInfo.infoIdList.forEach(item => {
+      if (this.form.type=='2'){
+        checkingInfo.infoIdList.forEach(item=>{
           let listImg = [];
           if (existsImg(item.welding)) {
-            listImg = forInImg(item.welding, listImg)
+            listImg =forInImg(item.welding,listImg)
           }
           if (existsImg(item.aczoiling)) {
-            listImg = forInImg(item.aczoiling, listImg)
+            listImg =forInImg(item.aczoiling,listImg)
           }
           if (existsImg(item.piping)) {
-            listImg = forInImg(item.piping, listImg)
+            listImg =forInImg(item.piping,listImg)
           }
           if (existsImg(item.warning)) {
-            listImg = forInImg(item.warning, listImg)
+            listImg =forInImg(item.warning,listImg)
           }
           if (existsImg(item.backfilling)) {
-            listImg = forInImg(item.backfilling, listImg)
+            listImg =forInImg(item.backfilling,listImg)
           }
-          item.zEngiineeringPhotoBoList = listImg;
-          item.nodeName = this.dictArr.find(o => o.dictValue == this.$refs.ConstructionDetails.activeNames).dictLabel;
+          item.zEngiineeringPhotoBoList=listImg;
+          item.nodeName = this.dictArr.find(o=>o.dictValue==this.$refs.ConstructionDetails.activeNames).dictLabel;
         });
       }
       let params = checkingInfo
@@ -656,13 +643,17 @@ export default {
       })
     },
     updateNodeOption(value) {
+      console.log('value')
+      console.log(value)
+      console.log(this.form)
       try {
         this.form.zEngineeringNodeBo.zEngineeringInfoBoList = this.form.zEngineeringNodeBo.zEngineeringInfoBoList.filter(obj => value.map(o => o.id).includes(obj.id))
       } catch (e) {
       }
       this.form.files = this.form.pics
-      EditEngineeEngineeIndustry(this.form).then(res => {
+      UpdateEngineeIndustry(this.form).then(res => {
         this.$modal.msgSuccess("修改成功");
+
         this.$refs.ConstructionDetails.dialogVisible = false
       })
       this.getList();
@@ -675,6 +666,33 @@ export default {
         this.zEngineeringMaterialBo.specifications = res.data
       })
     },
+    //添加用料信息
+    async addzEngineeringMaterBo(row) {
+      console.log("添加用料信息", row)
+      this.zEngineeringNodeBo = { // 工程节点
+        type: '', // 节点类型
+        zEngineeringInfoBo: { // 施工信息
+          constructUser: '', // 施工人
+          constructTime: '', // 施工时间
+          zEngiineeringPhotoBoList: [], // 图片列表
+          zEngineeringMaterialBo: []
+        },
+      }
+      this.zEngineeringMaterialBo = [ // 用料对象
+        {
+          materialQuality: '', // 用料材质
+          specifications: '', // 用料规格
+          number: '' // 用料数量
+        },
+      ]
+      const id = row.id
+      putEngineeEngineeIndustry(id).then(response => {
+        this.loading = false;
+        this.form = response.data
+        this.form.zEngineeringNodeBo = []
+        this.nodeDetailVisible = true;
+      });
+    },
     updateMaterBo() {
       this.form.zEngineeringNodeBo = []
       if (this.zEngineeringMaterialBo.length > 0) {
@@ -688,9 +706,14 @@ export default {
         if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == null) {
           valid = false;
         }
+
+        if (typeof (this.form.enginClassification) != 'string' && this.form.enginClassification != [] && this.form.enginClassification.length > 0) {
+          this.form.enginClassification = this.form.enginClassification.join(',');
+        }
         if (valid) {
           this.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
+          this.zEngineeringNodeBo.type = this.$route.query.type
           this.$refs.nodeForm.validate(valid => {
             if (valid) {
               EditEngineeEngineeIndustry(this.form).then(res => {
@@ -734,23 +757,26 @@ export default {
     removezEngineeringMaterialBo(index) {
       this.zEngineeringMaterialBo.splice(index, 1)
     },
-    // 工程类型与节点类型
+    // 根据url获取type节点类型
     getType() {
-      getDicts("municipal_engineering").then(res => {
-        this.EngineepipeType = res.data
-      });
-      getDicts("municipal_node_types").then(res => {
-        this.nodeList = res.data
-      })
-    },
-    // 新增顶管工程
-    enginNodeStatusExecuted(item) {
-      try {
-        if (this.currentCheckingEnginList.filter(e => e.label == item.dictValue)[0].status == '1') return true
-      } catch (error) {
-        return false
+      const queryString = window.location.search;
+      const params = new URLSearchParams(queryString);
+      const type = params.get('type');
+      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: '气源'}, {value: '排迁', label: '排迁'}
+          ]
+        )
       }
     },
+    // 新增顶管工程
     addNewPipe(data) {
       // console.log(this.form)
       this.$refs.enginPipe.openDialog({
@@ -758,47 +784,64 @@ export default {
         type: this.form.type
       }, 'add', data)
     },
-    //添加用料信息
-    addzEngineeringMaterBo(data) {
-      this.title = "添加用料";
-      this.reset();
-      const id = data.id
-      putEngineeEngineeIndustry(id).then(res => {
-        this.form = res.data
-        this.currentType = 'addMaterial'
-        this.open = true
-      })
-    },
+    // #003 历史施工
     viewSource(e, type = null) {
+      console.log('历史施工', e)
       this.currentId = e.id
-      let dict = []
-      for (let i = 0; i < this.nodeList.length; i++) {
-        dict.push({
-          label: this.nodeList[i].dictLabel,
-          value: this.nodeList[i].dictValue
-        })
-      }
-      this.status = 'read-only'
-      this.$refs.ConstructionDetails.open(dict, null, null, null, this.status)
+      let val = e.enginType + "_" + e.enginClassification
+      val = 'municipal_engineering_node'
+      // alert(val)
+      getDicts(val).then(res => {
+        let dict = []
+        for (let i = 0; i < res.data.length; i++) {
+          dict.push({
+            "label": res.data[i].dictLabel,
+            "value": res.data[i].dictValue,
+          })
+        }
+        // 市政工程功能已完成 工业工程请根据自己需求酌情修改此处代码
+        this.$refs.ConstructionDetails.open(this.form.type == 2 ? dict : [
+          {
+            value: "历史数据",
+            label: "历史数据"
+          }
+        ], this.form.type, type, null, null, e.enginClassification, null, this.form.type === '1' ? "工业工程" : "市政工程")
+        this.status = 'read-only'
+      })
+      // this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+      // this.status = 'read-only'
     },
+    // #002 修改施工信息
     updateviewSource(e) {
       this.currentId = e.id
-      let dict = []
-      for (let i = 0; i < this.nodeList.length; i++) {
-        dict.push({
-          label: this.nodeList[i].dictLabel,
-          value: this.nodeList[i].dictValue
-        })
-      }
-      this.status = 'put'
-      this.$refs.ConstructionDetails.open(dict, null, null, null, this.status)
+      // this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
+      let val = e.enginType + "_" + e.enginClassification
+      val = 'municipal_engineering_node'
+      // alert(val)
+      getDicts(val).then(res => {
+        let dict = []
+        for (let i = 0; i < res.data.length; i++) {
+          dict.push({
+            "label": res.data[i].dictLabel,
+            "value": res.data[i].dictValue,
+          })
+        }
+        // 市政工程功能已完成 工业工程请根据自己需求酌情修改此处代码
+        this.$refs.ConstructionDetails.open(this.form.type == 2 ? dict : [
+          {
+            value: "历史数据",
+            label: "历史数据"
+          }
+        ], this.form.type, null, null, null, e.enginClassification, null, this.form.type === '1' ? "工业工程" : "市政工程")
+        this.status = 'put'
+      })
     },
     viewNodeSource(e) {
       // alert('type='+e)
       if (!e) return
       console.log('todo: 获取数据', e)
       // todo: 获取数据
-      let httpMethod = this.form.type == '1' ? QueryEngineeIndustrys : QueryEngineeIndustry;
+      let httpMethod = this.form.type=='1'?QueryEngineeIndustrys:QueryEngineeIndustry;
       httpMethod({
         id: this.currentId,
         type: e
@@ -819,6 +862,15 @@ export default {
       this.nodeDetailVisible = false
       this.reset()
     },
+    // 修改施工信息
+    toNodeDetail() {
+      // 根据材质id查询对应规格回显
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.nodeDetailVisible = true
+        }
+      })
+    },
     getUrl(url) {
       this.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
     },
@@ -895,39 +947,15 @@ export default {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
           }
         }
-        this.title = "修改市政工程";
+        if (this.form.enginClassification != null) {
+          this.form.enginClassification = this.form.enginClassification.split(",");
+        }
+        this.title = (this.form.type === '1' ? "修改工业工程" : "修改市政工程");
         this.currentType = 'put'
         this.open = true;
       });
     },
-    toNodeDetail() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let nodeCollection = []
-          // 收集节点信息
-          this.currentCheckList.forEach((e, idx) => {
-            let nodeItem = this.$refs['EnginNodeInfo' + idx][0].infoCollection()
-            nodeCollection.push(nodeItem)
-          })
-          this.form.zEngineeringNodeBoList = nodeCollection
-          if (this.title == '添加用料') {
-            this.buttonLoading = true
-            addEngineeEngineeIndustry(this.form).then(res => {
-              if (res.code == 200) {
-                this.$message({
-                  message: '添加成功',
-                  type: 'success'
-                });
-                this.buttonLoading = false
-                this.open = false
-                this.currentCheckList = []
-                this.getList()
-              }
-            })
-          }
-        }
-      })
-    },
+
     /** 提交按钮 */
     submitForm() {
       this.form.zEngineeringNodeBo = null
@@ -1001,12 +1029,10 @@ export default {
 
   .el-dialog__body {
     height: 85%;
-    overflow-y: scroll;
   }
 
   .el-form-item {
     margin-bottom: 22px;
-    padding-left: 30px;
     width: 44%;
     display: inline-block;
   }