Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/views/zdsz/engineeringCivil/index.vue

@@ -256,7 +256,7 @@
         </el-form-item>
         <el-form-item label="工程节点">
           <el-select
-            v-model="enginClassificationinfo"
+            v-model="enginClassification"
             placeholder="请选择工程节点"
           >
             <el-option
@@ -323,6 +323,7 @@ import {getBuildingList} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
 import EngineeNode from '@/components/EngineeNode/index'
 import EngineePipe from "@/components/EngineePipe"
+import {resetForm} from "@/utils/ruoyi";
 export default {
   components:{
     EngineeNode,
@@ -632,6 +633,39 @@ export default {
         updateBy: undefined,
         updateTime: undefined
       };
+      this.queryParams= {
+        pageNum: 1,
+        pageSize: 10,
+        district: undefined,
+        areaId: undefined,
+        buildingId: undefined,
+        unitId: undefined,
+        houseId: undefined,
+        enginType: undefined,
+        enginClassification: undefined,
+        enginCycle: undefined,
+        completionStatus: undefined,
+        imgUrl: undefined,
+        zEngineeringNodeBo: {
+          type: undefined,
+          zEngineeringInfoBo: {
+            constructAddre: undefined,        // 施工地址
+            constructPhone: undefined,        // 施工人电话
+            constructUser: undefined,         // 施工人
+            headName: undefined,              // 负责人
+            headPhone: undefined,             // 负责人电话
+            constructAccordingDrawings: undefined, // 是否按图纸施工
+            segmentedCompressionQualified: undefined, // 分段打压是否合格
+            selfClosingValveType: undefined,          // 自闭阀类型
+            visitType: undefined,                     // 上门类型
+            backfillTime: undefined,                  // 回填时间
+            constructTime: undefined,                  // 施工时间
+            zEngiineeringPhotoBoList: undefined,              // 图片列表
+            zEngineeringMaterialBo: undefined,// 用料对象,    //节点信息
+          }
+        }
+      }
+      this.enginClassification=null
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -730,7 +764,7 @@ export default {
         {
           this.enginClassificationOption = this.dict.type[res.data.enginClassification]
         }
-        this.enginClassificationinfo=zEngineeringNodeBo.type
+        this.enginClassification=zEngineeringNodeBo.type
         newData.zEngineeringNodeBo = zEngineeringNodeBo
         this.currentType = 'put'
         this.queryParams = newData

src/views/zdsz/engineeringIndustry/index.vue

@@ -120,44 +120,44 @@
         <el-form-item label="工程名称" prop="enginName">
           <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="20"></el-input>
         </el-form-item>
-        <el-form-item label="现场负责人" prop="sceneHead">
-          <el-input v-model="form.sceneHead" placeholder="请填写现场负责人" maxlength="20"></el-input>
-        </el-form-item>
-        <el-form-item label="设计负责人" prop="designHead">
-          <el-input v-model="form.designHead" placeholder="请填写现场负责人" maxlength="20"></el-input>
+        <el-form-item label="建筑单位" prop="constructUnit">
+          <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"></el-input>
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectHead">
           <el-input v-model="form.projectHead" placeholder="请填写项目负责人" maxlength="20"></el-input>
         </el-form-item>
+        <el-form-item label="现场负责人" prop="sceneHead">
+          <el-input v-model="form.sceneHead" placeholder="请填写现场负责人" maxlength="20"></el-input>
+        </el-form-item>
         <el-form-item label="设计单位" prop="designUnit">
           <el-input v-model="form.designUnit" placeholder="请填写设计单位" maxlength="50"></el-input>
         </el-form-item>
-        <el-form-item label="监理负责人" prop="supervisionHead">
-          <el-input v-model="form.supervisionHead" placeholder="请填写监理负责人" maxlength="20"></el-input>
+        <el-form-item label="设计负责人" prop="designHead">
+          <el-input v-model="form.designHead" placeholder="请填写现场负责人" maxlength="20"></el-input>
         </el-form-item>
         <el-form-item label="设计联系方式" prop="designPhone">
           <el-input v-model="form.designPhone" placeholder="请填写联系方式" maxlength="13"></el-input>
         </el-form-item>
+        <el-form-item label="监理单位" prop="supervisionUnit">
+          <el-input v-model="form.supervisionUnit" placeholder="请填写监理单位" maxlength="50"/>
+        </el-form-item>
+        <el-form-item label="监理负责人" prop="supervisionHead">
+          <el-input v-model="form.supervisionHead" placeholder="请填写监理负责人" maxlength="20"></el-input>
+        </el-form-item>
         <el-form-item label="监理联系电话" prop="supervisionPhone">
           <el-input v-model="form.supervisionPhone" placeholder="请填写联系方式" maxlength="13"></el-input>
         </el-form-item>
-        <el-form-item label="建筑单位" prop="constructUnit">
-          <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"></el-input>
-        </el-form-item>
-        <el-form-item label="监理单位" prop="supervisionUnit">
-          <el-input v-model="form.supervisionUnit" placeholder="请填写监理单位" maxlength="50"/>
+        <el-form-item label="工程类型" prop="enginType">
+          <el-select v-model="form.enginType" placeholder="请选择工程类型" style="width: 100%">
+            <el-option
+              v-for="e in EngineepipeType"
+              :key="e.value"
+              :label="e.label"
+              :value="e.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-<!--        <el-form-item label="类型" prop="enginType">-->
-<!--          <el-select v-model="form.enginType" placeholder="请选择类型" style="width: 100%" disabled>-->
-<!--            <el-option-->
-<!--              v-for="e in EngineepipeType"-->
-<!--              :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.enginType === '1'">
+        <el-form-item label="工程分类" prop="enginClassification" v-if="form.type === '1'">
           <el-select v-model="form.enginClassification" placeholder="请选择工程分类" style="width: 100%">
             <el-option
               v-for="e in dict.type.engin_classification"
@@ -167,18 +167,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-row>
-          <el-form-item label="备注" prop="remark">
-            <el-input
-              v-model="form.remark"
-              type="textarea"
-              placeholder="请输入内容"
-              class="remark_input"
-              maxlength="200"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-form-item label="附件" prop="zEngineeringAttachmentsList" style="width: 100%;">-->
+<!--            <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :value="zEngineeringAttachmentsList"-->
+<!--                            @input="getUrl"></ObsImageUpload>-->
+<!--          </el-form-item>-->
+<!--        </el-row>-->
+
+<!--        <el-row>-->
+<!--          <el-form-item label="备注" prop="remark">-->
+<!--            <el-input-->
+<!--              v-model="form.remark"-->
+<!--              type="textarea"-->
+<!--              placeholder="请输入内容"-->
+<!--              class="remark_input"-->
+<!--              maxlength="200"-->
+<!--              show-word-limit-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写施工信息</el-button>
@@ -186,85 +193,110 @@
       </div>
     </el-dialog>
     <!-- 施工信息dialog -->
-        <el-dialog :visible.sync="nodeDetailVisible" :rules="nodeRules" title="施工信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
-          <!-- 节点选项卡 -->
-<!--          <el-tabs type="border-card" class="engineNodeTypes">-->
-<!--            <el-tab-pane label="基本信息"></el-tab-pane>-->
-<!--            <el-tab-pane-->
-<!--              :label="e"-->
-<!--              v-for="e in currentNode"-->
-<!--              :key="e"-->
-<!--            >-->
-<!--            </el-tab-pane>-->
-<!--          </el-tabs>-->
+        <el-dialog :visible.sync="nodeDetailVisible" title="施工信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
           <!-- 节点表单 -->
-          <el-form ref="nodeForm" :model="zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
-<!--            <el-form-item label="节点类型" prop="type"  >-->
-<!--              <el-select v-model="nodeType" placeholder="请选择节点类型" disabled style="width: 100%">-->
-<!--                <el-option-->
-<!--                  v-for="e in dict.type.engineering_infrastructure"-->
-<!--                  :key="e.value"-->
-<!--                  :label="e.label"-->
-<!--                  :value="e.value"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-            <el-form-item label="施工地址" prop="constructAddre">
-              <el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址" maxlength="50"></el-input>
-            </el-form-item>
-            <el-form-item label="施工人电话" prop="constructPhone">
-              <el-input v-model="zEngineeringInfoBo.constructPhone" placeholder="请填写施工人电话" maxlength="13"></el-input>
-            </el-form-item>
-            <el-form-item label="施工人" prop="constructUser">
-              <el-input v-model="zEngineeringInfoBo.constructUser" placeholder="请填写施工人" maxlength="20"></el-input>
-            </el-form-item>
-            <el-form-item label="负责人" prop="headName">
-              <el-input v-model="zEngineeringInfoBo.headName" placeholder="请填写负责人" maxlength="20"></el-input>
-            </el-form-item>
-            <el-form-item label="负责人电话" prop="headPhone">
-              <el-input v-model="zEngineeringInfoBo.headPhone" placeholder="请填写负责人电话" maxlength="13"></el-input>
-            </el-form-item>
-            <el-form-item label="回填时间" prop="backfillTime">
-              <el-date-picker
-                v-model="zEngineeringInfoBo.backfillTime"
-                value-format="yyyy-MM-dd hh:mm:ss"
-                type="datetime"
-                style="width: 100%"
-                placeholder="请选择回填日期">
-              </el-date-picker>
-            </el-form-item>
+          <el-form ref="nodeForm" :model="form.zEngineeringNodeBo.zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
             <el-form-item label="施工时间" prop="constructTime">
               <el-date-picker
-                v-model="zEngineeringInfoBo.constructTime"
+                v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.constructTime"
                 value-format="yyyy-MM-dd hh:mm:ss"
                 type="datetime"
                 style="width: 100%"
                 placeholder="请选择施工时间">
               </el-date-picker>
+
             </el-form-item>
-            <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">
-              <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings" style="width: 100%">
-                <el-option
-                  v-for="e in constructAccordingDrawingsOption"
-                  :key="e.value"
-                  :label="e.label"
-                  :value="e.value"
-                ></el-option>
-              </el-select>
+            {{form.zEngineeringNodeBo.zEngineeringInfoBo.constructTime}}
+            <el-form-item label="施工地址" prop="constructAddre">
+              <el-input v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址" maxlength="50"></el-input>
+            </el-form-item>
+            <el-form-item label="施工人" prop="constructUser" v-if="form.id">
+              <el-input v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.constructUser" placeholder="请填写施工人" maxlength="20" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="施工人电话" prop="constructPhone" v-if="form.id">
+              <el-input v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.constructPhone" placeholder="请填写施工人电话" maxlength="13" disabled></el-input>
             </el-form-item>
-            <el-form-item label="分段打压" prop="segmentedCompressionQualified">
-              <el-select v-model="zEngineeringInfoBo.segmentedCompressionQualified" style="width: 100%">
-                <el-option
-                  v-for="e in segmentedCompressionQualifiedOption"
-                  :key="e.value"
-                  :label="e.label"
-                  :value="e.value"
-                ></el-option>
-              </el-select>
+            <el-form-item label="负责人" prop="headName" v-if="form.id">
+              <el-input v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.headName" placeholder="请填写负责人" maxlength="20" disabled></el-input>
             </el-form-item>
+            <el-form-item label="负责人电话" prop="headPhone" v-if="form.id">
+              <el-input v-model="form.zEngineeringNodeBo.zEngineeringInfoBo.headPhone" placeholder="请填写负责人电话" maxlength="13" disabled></el-input>
+            </el-form-item>
+<!--            <el-button icon="el-icon-plus" size="small" type="primary" @click="addzEngineeringMaterialBo()">添加用料</el-button>-->
+<!--            <el-row :gutter="10">-->
+<!--              <div v-for="(item, index) in form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo" :key="index" style="width: 100px;height: 100px;background-color: #0BB0DE">-->
+<!--                <el-col :span="7">-->
+<!--                  <div style="width: 100px;height: 100px;background-color: #0BB0DE">-->
+<!--                    <el-form-item-->
+<!--                      :prop="'zEngineeringInfoBo.zEngineeringMaterialBo.' + index + '.materialQuality'"-->
+<!--                      label="材质" + index-->
+<!--                      :rules="{required: true, message: '材质不能为空', trigger: 'blur'}">-->
+<!--                      <el-input v-model="item.materialQuality" placeholder="请填写材质" maxlength="20"/>-->
+<!--                    </el-form-item>-->
+<!--                  </div>-->
+<!--                </el-col>-->
+<!--                <el-col :span="7">-->
+<!--                  <div style="width: 100px;height: 100px;background-color: #0BB0DE">-->
+<!--                    <el-form-item-->
+<!--                      :prop="'zEngineeringInfoBo.zEngineeringMaterialBo.' + index + '.specifications'"-->
+<!--                      label="规格" + index-->
+<!--                      :rules="{required: true, message: '规格不能为空', trigger: 'blur'}">-->
+<!--                      <el-input v-model="item.specifications" placeholder="请填写材质" maxlength="20"/>-->
+<!--                    </el-form-item>-->
+<!--                  </div>-->
+<!--                </el-col>-->
+<!--                <el-col :span="7">-->
+<!--                  <div style="width: 100px;height: 100px;background-color: #0BB0DE">-->
+<!--                    <el-form-item-->
+<!--                      :prop="'zEngineeringInfoBo.zEngineeringMaterialBo.' + index + '.number'"-->
+<!--                      label="数量" + index-->
+<!--                      :rules="{required: true, message: '数量不能为空', trigger: 'blur'}">-->
+<!--                      <el-input v-model="item.number" placeholder="请填写数量" maxlength="8"/>-->
+<!--                    </el-form-item>-->
+<!--                  </div>-->
+<!--                </el-col>-->
+<!--                <el-col :span="3">-->
+<!--                  <div style="width: 100px;height: 100px;background-color: #0BB0DE">-->
+<!--                    <el-form-item>-->
+<!--                      <el-button type="danger" icon="el-icon-delete" @click.prevent="removezEngineeringMaterialBo(item,index)"/>-->
+<!--                    </el-form-item>-->
+<!--                  </div>-->
+<!--                </el-col>-->
+<!--              </div>-->
+<!--            </el-row>-->
+
+<!--            <el-form-item label="回填时间" prop="backfillTime">-->
+<!--              <el-date-picker-->
+<!--                v-model="zEngineeringInfoBo.backfillTime"-->
+<!--                value-format="yyyy-MM-dd hh:mm:ss"-->
+<!--                type="datetime"-->
+<!--                style="width: 100%"-->
+<!--                placeholder="请选择回填日期">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">-->
+<!--              <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="e in constructAccordingDrawingsOption"-->
+<!--                  :key="e.value"-->
+<!--                  :label="e.label"-->
+<!--                  :value="e.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="分段打压" prop="segmentedCompressionQualified">-->
+<!--              <el-select v-model="zEngineeringInfoBo.segmentedCompressionQualified" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="e in segmentedCompressionQualifiedOption"-->
+<!--                  :key="e.value"-->
+<!--                  :label="e.label"-->
+<!--                  :value="e.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-row>
               <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-                <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
+                <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList"
                                 @input="getUrl"></ObsImageUpload>
               </el-form-item>
             </el-row>
@@ -305,7 +337,6 @@ export default {
   },
   data() {
     return {
-      nodeType:'',
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -318,6 +349,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 工程分类显示
       engineeType: true,
       // 总条数
       total: 0,
@@ -331,38 +363,14 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        enginName: '',
-        enginClassification: '',
+        enginName: '', // 工程名称
+        enginClassification: '', // 工程分类
         zEngineeringNodeBo: {
           type: '',
           zEngineeringInfoBo: {},    //施工信息
         }
       },
-      zEngineeringInfoBo: {
-        type: '',               // 节点类型
-        constructAddre: '',        // 施工地址
-        constructPhone: '',        // 施工人电话
-        constructUser: '',         // 施工人
-        headName: '',              // 负责人
-        headPhone: '',             // 负责人电话
-        constructAccordingDrawings: '', // 是否按图纸施工
-        segmentedCompressionQualified: '', // 分段打压是否合格
-        backfillTime: '',                  // 回填时间
-        constructTime: '',                  // 施工时间
-        zEngiineeringPhotoBoList: [],              // 图片列表
-        zEngineeringMaterialBo: [],// 用料对象
-      },                          // 施工信息
-      EngineepipeType: [
-        {
-          value: '1',
-          label: '工业工程'
-        },
-        {
-          value: '2',
-          label: '市政工程'
-        }
-      ],
-      constructAccordingDrawingsOption: [
+      constructAccordingDrawingsOption: [ // 是否按图纸施工
         {
           value: '1',
           label: '是'
@@ -372,7 +380,7 @@ export default {
           label: '否'
         }
       ],
-      segmentedCompressionQualifiedOption: [
+      segmentedCompressionQualifiedOption: [ // 分段打压
         {
           value: '1',
           label: '是'
@@ -382,11 +390,42 @@ export default {
           label: '否'
         }
       ],
-      nodeDetailVisible: false,
+      nodeDetailVisible: false, // 施工信息dialog
       // 表单参数
       form: {
-        enginClassification:''
+        type:'', // 用来区分工业工程、市政工程
+        enginName:'', // 工程名称
+        enginType:'', // 工程类型
+        constructUnit:'', // 建筑单位
+        projectHead:'', // 项目负责人
+        sceneHead:'', // 现场负责人
+        designUnit:'', // 设计单位
+        designHead:'', // 设计负责人
+        designPhone:'', // 设计联系电话
+        supervisionUnit:'', // 监理单位
+        supervisionHead:'', // 监理负责人
+        supervisionPhone:'', // 监理联系电话
+        enginClassification:'', // 工程分类
+        zEngineeringNodeBo:{ // 工程节点
+          type:'', // 节点类型
+          zEngineeringInfoBo: { // 施工信息
+            constructAddre: '', // 施工地址
+            constructPhone: '', // 施工人电话
+            constructUser: '', // 施工人
+            headName: '', // 负责人
+            headPhone: '', // 负责人电话
+            constructTime: '', // 施工时间
+            zEngiineeringPhotoBoList: [], // 图片列表
+            zEngineeringMaterialBo: [ // 用料对象
+              {materialQuality: ''}, // 用料材质
+              {specifications: ''}, // 用料规格
+              {number: ''}, // 用料数量
+            ],
+          },
+        },
       },
+      zEngineeringAttachmentsList:[], // 工程附件
+      EngineepipeType: [], // 工程类型
       // 表单校验
       rules: {
         sceneHead: [
@@ -396,7 +435,7 @@ export default {
           {required: true, message: "工程名称不能为空", trigger: 'blur'}
         ],
         enginClassification: [
-          {required: true, message: "工程分类不能为空", trigger: ['change','blur']}
+          {required: true, message: "工程分类不能为空", trigger: 'blur'}
         ],
         supervisionUnit: [
           {required: true, message: "监理单位不能为空", trigger: 'blur'}
@@ -428,37 +467,27 @@ export default {
           {required: true, message: "监理负责人不能为空", trigger: 'blur'}
         ],
         type: [
-          {required: false, message: "类型不能为空", trigger: "change"}
-        ],
-        isQualified: [
-          {required: true, message: "安检是否合格不能为空", trigger: "blur"}
+          {required: false, message: "类型不能为空", trigger: "blur"}
         ],
         remark: [
           {required: false, message: "备注不能为空", trigger: "blur"}
         ],
+        zEngineeringAttachmentsList: [
+          {required: false, message: "附件不能为空", trigger: "blur"}
+        ],
+
       },
       // 节点规则校验
       nodeRules: {
-        constructAddre: [
-          {required: true, message: "施工地址不能为空", trigger: 'blur'}
-        ],
-        constructPhone: [
-          {required: true, message: "施工人电话不能为空", trigger: 'blur'},
-          {validator: validPhoneMobile, trigger: 'blur'}
-        ],
-        constructUser: [
-          {required: true, message: "施工人不能为空", trigger: 'blur'}
-        ],
-        headName: [
-          {required: true, message: "负责人不能为空", trigger: 'blur'}
-        ],
-        headPhone: [
-          {required: true, message: "负责人电话不能为空", trigger: 'blur'},
-          {validator: validPhoneMobile, trigger: 'blur'}
-        ],
-        zEngiineeringPhotoBoList: [
-          {required: true, message: "图片不能为空", trigger: 'blur'}
-        ],
+        // constructTime: [
+        //   {required: true, message: "施工时间不能为空", trigger: 'blur'}
+        // ],
+        // constructAddre: [
+        //   {required: true, message: "施工地址不能为空", trigger: 'blur'}
+        // ],
+        // zEngiineeringPhotoBoList: [
+        //   {required: true, message: "图片不能为空", trigger: 'blur'}
+        // ],
 
       }
     };
@@ -472,23 +501,33 @@ export default {
     }
   },
   methods: {
+    // addzEngineeringMaterialBo(){
+    //   this.zEngineeringInfoBo.zEngineeringMaterialBo.push({
+    //     materialQuality: '', // 用料材质
+    //     specifications: '', // 用料规格
+    //     number: '' // 用料数量
+    //   })
+    //   console.log(this.zEngineeringInfoBo.zEngineeringMaterialBo)
+    // },
+    // removezEngineeringMaterialBo(item, index){
+    //   this.zEngineeringInfoBo.zEngineeringMaterialBo.splice(index, 1)
+    // },
     // 根据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;
-        this.form.enginType = type;
-        this.nodeType = (type === '1' ? "工业工程" : "市政工程")
+        this.form.zEngineeringNodeBo.type = (type === '1' ? "工业工程" : "市政工程")
+        this.EngineepipeType = (type === '1' ? [{ value: '0', label: '小微商服' },{ value: '1', label: '新建工业' },{ value: '2', label: '改造工业' }] : [{ value: '0', label: '气源' },{ value: '1', label: '排迁' }])
       }
     },
     // 新增顶管工程
     addNewPipe(data) {
       this.$refs.enginPipe.openDialog({
         id: data.id,
-        type: (this.form.type === '1' ? "工业工程" : "市政工程")
+        type: this.form.zEngineeringNodeBo.type
       }, 'add')
     },
     nodeCancel() {
@@ -502,7 +541,7 @@ export default {
       })
     },
     getUrl(url) {
-      this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
+      this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
     },
     /** 查询市政工程|工业工程列表 */
     getList() {
@@ -525,9 +564,13 @@ export default {
       for (let formKey in this.form) {
         this.form[formKey] = null
       }
-      for (let formKey in this.zEngineeringInfoBo) {
-        this.zEngineeringInfoBo[formKey] = null
-      }
+      this.form.zEngineeringNodeBo={}
+      this.form.zEngineeringNodeBo.zEngineeringInfoBo={}
+      this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo=[]
+      // this.resetForm("form");
+      // for (let formKey in this.zEngineeringInfoBo) {
+      //   this.zEngineeringInfoBo[formKey] = null
+      // }
       this.getType()
     },
     /** 搜索按钮操作 */
@@ -560,7 +603,8 @@ export default {
       putEngineeEngineeIndustry(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        this.zEngineeringInfoBo = response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
+        this.form.zEngineeringNodeBo = response.data.zengineeringNodeBo[0]
+        this.form.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
         this.open = true;
         this.title = (this.form.type === '1' ? "修改工业工程":"修改市政工程");
       });
@@ -571,10 +615,10 @@ export default {
         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
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.form.zEngineeringNodeBo.zEngineeringMaterialBo
+            // this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.form.zEngineeringNodeBo.zEngineeringMaterialBo
             addEngineeEngineeIndustry(this.form).then(res => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -582,10 +626,10 @@ export default {
               this.getList();
             })
           } else {
-            this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
-            this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.form.zEngineeringNodeBo.zEngineeringMaterialBo
+            // this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
+            // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.form.zEngineeringNodeBo.zEngineeringMaterialBo
             EditEngineeEngineeIndustry(this.form).then(res => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;