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

src/components/EngineeNode/index.vue

@@ -160,7 +160,6 @@
 <script>
 import {
     addEnginee,                                // 新增工业工程
-    addEngineeringDangerous,                   // 新增危险作业工程
     addEngineeringPipeJacking,                 // 新增顶管工程
     putEngineeringPipeJacking,                 // 修改顶管工程
     getEnginMaterialQualityList,               // 获取工程材质
@@ -169,6 +168,7 @@ import {
     putEngineeringCivil,                       // 民用修改
     putEngineeringInfrastructure,              // 基建修改
 } from "@/api/zdsz/enginee"
+import {updateEngineeringDangerous,addEngineeringDangerous} from "@/api/zdsz/engineeringDangerous";
 export default {
     name:'EngineeNode',
     dicts:['pass_check','is_repair','engin_type','self_closing_valve_type','visit_type','corrosion_level','brand','engineering_infrastructure'],
@@ -287,12 +287,21 @@ export default {
                             })
                         break;
                         case 3 :
-                            // 危险作业工程
+                            // 危险作业工程新增
+                            this.params.zEngineeringNodeBo = {}
                             this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
+                            this.params.zEngineeringNodeBo.type = this.nodeType
                             this.params.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
                             console.log(this.params)
-                            addEngineeringDangerous(this.params).then(res => {
-                                console.log(res)
+                          addEngineeringDangerous(this.params).then(res => {
+                            if(res.code == 200){
+                              this.$message({
+                                message: '新增成功',
+                                type: 'success'
+                              });
+                              this.$emit('closeToSucceed')
+                              this.nodeDetailVisible = false
+                            }
                             })
                         break;
                         case 4 :
@@ -371,6 +380,24 @@ export default {
                               }
                             })
                         break;
+
+                      case 37:
+                        // 危险修改
+                        this.params.zEngineeringNodeBo = {}
+                        this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
+                        this.params.zEngineeringNodeBo.type = this.nodeType
+                        updateEngineeringDangerous(this.params).then(res => {
+                          console.log('危险________',res)
+                          if(res.code == 200){
+                            this.$message({
+                              message: '修改成功',
+                              type: 'success'
+                            });
+                            this.$emit('closeToSucceed')
+                            this.nodeDetailVisible = false
+                          }
+                        })
+                        break;
                     }
                 // this.params.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
                 // console.log(this.queryParams)
@@ -406,6 +433,10 @@ export default {
             if(type == 14){
               this.zEngineeringInfoBo = this.params.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
             }
+            if(type === 37){
+              this.zEngineeringInfoBo = this.params.zEngineeringNodeBos[0].zEngineeringInfoBoList[0]
+              this.nodeType = this.params.zEngineeringNodeBos[0].type
+            }
         },
         reset(){
             this.$refs['nodeForm'].resetFields()

src/views/zdsz/engineeringDangerous/index.vue

@@ -32,14 +32,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工程时间" prop="enginTime">
-        <el-date-picker clearable
-                        v-model="queryParams.enginTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择工程时间">
-        </el-date-picker>
-      </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>
@@ -107,7 +99,7 @@
           <span>{{ parseTime(scope.row.enginTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="管径" align="center" prop="pipeDiameter"/>
+<!--      <el-table-column label="管径" align="center" prop="pipeDiameter"/>
       <el-table-column label="管材" align="center" prop="tubularProduct"/>
       <el-table-column label="是否存在套管" align="center" prop="casingPresent"/>
       <el-table-column label="管道压力" align="center" prop="pipePressure"/>
@@ -136,7 +128,7 @@
       <el-table-column label="回填" align="center" prop="backfill"/>
       <el-table-column label="夯实" align="center" prop="tamp"/>
       <el-table-column label="平整场地" align="center" prop="levelingTheSite"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="备注" align="center" prop="remark"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -311,91 +303,10 @@
       </div>
     </el-dialog>
     <!-- 节点信息dialog -->
-
-    <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="nodeType">
-          <el-input v-model="nodeType" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="施工地址" prop="constructAddre">
-          <el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址"></el-input>
-        </el-form-item>
-        <el-form-item label="施工人电话" prop="constructPhone">
-          <el-input v-model="zEngineeringInfoBo.constructPhone" placeholder="请填写施工人电话"></el-input>
-        </el-form-item>
-        <el-form-item label="施工人" prop="constructUser">
-          <el-input v-model="zEngineeringInfoBo.constructUser" placeholder="请填写施工人"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人" prop="headName">
-          <el-input v-model="zEngineeringInfoBo.headName" placeholder="请填写负责人"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人电话" prop="headPhone">
-          <el-input v-model="zEngineeringInfoBo.headPhone" placeholder="请填写负责人电话"></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"
-            placeholder="请选择回填日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="施工时间" prop="constructTime">
-          <el-date-picker
-            v-model="zEngineeringInfoBo.constructTime"
-            value-format="yyyy-MM-dd hh:mm:ss"
-            type="datetime"
-            placeholder="请选择施工时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">
-          <el-select v-model="zEngineeringInfoBo.constructAccordingDrawings">
-            <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">
-            <el-option
-              v-for="e in segmentedCompressionQualifiedOption"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="自闭阀类型" prop="selfClosingValveType">
-          <el-select v-model="zEngineeringInfoBo.selfClosingValveType">
-            <el-option
-              v-for="e in dict.type.self_closing_valve_type"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上门类型" prop="visitType">
-          <el-select v-model="zEngineeringInfoBo.visitType">
-            <el-option
-              v-for="e in dict.type.visit_type"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
-          <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
-                          @input="getUrl"></ObsImageUpload>
-        </el-form-item>
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
-        <el-button @click="nodeCancel">取 消</el-button>
-      </el-form>
-    </el-dialog>
+    <enginee-node
+      ref="childNode"
+      @closeToSucceed="closeToSucceed"
+    />
     <EngineePipe ref="enginPipe"/>
   </div>
 </template>
@@ -405,8 +316,6 @@ import {
   listEngineeringDangerous,
   getEngineeringDangerous,
   delEngineeringDangerous,
-  addEngineeringDangerous,
-  updateEngineeringDangerous
 } from "@/api/zdsz/engineeringDangerous";
 import { listComprehensive, getComprehensive, delComprehensive, addComprehensive, updateComprehensive } from "@/api/zdsz/comprehensive";
 import EngineeNode from "@/components/EngineeNode/index";
@@ -422,7 +331,7 @@ export default {
     }
   },
   components: {
-    EngineePipe
+    EngineePipe,EngineeNode
   },
   data() {
     return {
@@ -528,7 +437,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-   /*   rules: {
+      rules: {
         id: [
           {required: true, message: "不能为空", trigger: "blur"}
         ],
@@ -544,7 +453,7 @@ export default {
         enginTime: [
           {required: true, message: "工程时间不能为空", trigger: "blur"}
         ],
-        pipeDiameter: [
+     /*   pipeDiameter: [
           {required: true, message: "管径不能为空", trigger: "blur"}
         ],
         tubularProduct: [
@@ -630,11 +539,11 @@ export default {
         ],
         levelingTheSite: [
           {required: true, message: "平整场地不能为空", trigger: "blur"}
-        ],
-        remark: [
+        ],*/
+       /* remark: [
           {required: true, message: "备注不能为空", trigger: "blur"}
-        ],
-      },*/
+        ],*/
+      },
       // 节点规则校验
       nodeRules:{
         type: [
@@ -664,17 +573,43 @@ export default {
     this.getList();
   },
   methods: {
+    closeToSucceed(){
+      this.open = false;
+      this.getList()
+    },
     nodeCancel(){
       this.nodeDetailVisible = false
       this.resetNodeForm();
     },
 /*添加节点信息*/
-    toNodeDetail(){
+  /*  toNodeDetail(){
+      this.nodeDetailVisible = true
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.nodeDetailVisible = true
         }
       })
+    },*/
+    toNodeDetail(){
+      if(this.currentType === 'put'){
+        this.$refs.childNode.open(this.form,37)
+        this.currentType = null
+        return
+      }
+      // 加工 enginClassification 工程节点
+      // const parts = this.value[1].split('_');
+      // let result = parts.slice(2).join('_');
+      // this.queryParams.zEngineeringNodeBo.type = this.enginClassification
+      // this.queryParams.enginClassification = result
+      // console.log(this.queryParams)
+      this.$refs.childNode.open(this.form,3)
+      return
+      this.$refs['form'].validate(e => {
+        if(e){
+          this.nodeDetailVisible = true
+        }
+      })
+
     },
     // 新增顶管工程
     addNewPipe(data) {
@@ -690,7 +625,10 @@ export default {
     getList() {
       this.loading = true;
       listEngineeringDangerous({
-        ZEngineeringDangerousBo:{}
+        basicInformation:this.queryParams.basicInformation,
+        enginName:this.queryParams.enginName,
+        enginAddre:this.queryParams.enginAddre,
+        params:this.queryParams
       }).then(res => {
         this.engineeringDangerousList = res.rows;
         this.total = res.total;
@@ -798,16 +736,15 @@ export default {
       getEngineeringDangerous(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        console.log(response.data)
-        console.log(response.data.zEngineeringNodeBo.type)
-        this.zEngineeringInfoBo.type = response.data.zEngineeringNodeBo.type
-        this.zEngineeringInfoBo =response.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]
+        this.currentType = "put"
+      /*  this.zEngineeringInfoBo.type = response.data.zEngineeringNodeBo.type
+        this.zEngineeringInfoBo =response.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]*/
         this.open = true;
         this.title = "修改危险工程";
       });
     },
     /** 提交按钮 */
-    submitForm() {
+  /*  submitForm() {
       this.$refs["nodeForm"].validate(valid => {
         if (valid) {
           if (this.form.id == null){
@@ -833,7 +770,7 @@ export default {
           }
         }
       });
-    },
+    },*/
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;