|
@@ -7,7 +7,8 @@
|
|
|
|
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
- <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch" label-width="110px">
|
|
|
|
|
|
+ <el-form :model="searchParams" ref="searchParams" size="small" :inline="true" v-show="showSearch"
|
|
|
|
+ label-width="110px">
|
|
<el-form-item label="工程类型" prop="enginType">
|
|
<el-form-item label="工程类型" prop="enginType">
|
|
<el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>
|
|
<el-select v-model="searchParams.enginType" placeholder="请选择工程类型" clearable>
|
|
<el-option
|
|
<el-option
|
|
@@ -205,13 +206,15 @@
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-form-item label="附件" prop="files" v-if="form.id" style="width: 100%">
|
|
<el-form-item label="附件" prop="files" v-if="form.id" style="width: 100%">
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
- :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
|
|
|
|
|
|
+ :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
|
|
|
|
+ :limit="9999"
|
|
:value="form.pics"
|
|
:value="form.pics"
|
|
></ObsFileUpload>
|
|
></ObsFileUpload>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="附件" prop="files" v-else style="width: 100%">
|
|
<el-form-item label="附件" prop="files" v-else style="width: 100%">
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
- :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
|
|
|
|
|
|
+ :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
|
|
|
|
+ :limit="9999"
|
|
:value="form.files"
|
|
:value="form.files"
|
|
></ObsFileUpload>
|
|
></ObsFileUpload>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -380,7 +383,7 @@ export default {
|
|
open: false,
|
|
open: false,
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParams: {
|
|
queryParams: {
|
|
- enginType:null,
|
|
|
|
|
|
+ enginType: null,
|
|
enginName: '', // 工程名称
|
|
enginName: '', // 工程名称
|
|
enginClassification: '', // 工程分类
|
|
enginClassification: '', // 工程分类
|
|
},
|
|
},
|
|
@@ -494,8 +497,8 @@ export default {
|
|
],
|
|
],
|
|
},
|
|
},
|
|
searchParams: {
|
|
searchParams: {
|
|
- pageSize:10,
|
|
|
|
- pageNum:1,
|
|
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ pageNum: 1,
|
|
enginName: null, // 工程名称
|
|
enginName: null, // 工程名称
|
|
enginClassification: null, // 工程分类
|
|
enginClassification: null, // 工程分类
|
|
},
|
|
},
|
|
@@ -573,13 +576,13 @@ export default {
|
|
},
|
|
},
|
|
//添加用料信息
|
|
//添加用料信息
|
|
async addzEngineeringMaterBo(row) {
|
|
async addzEngineeringMaterBo(row) {
|
|
- this.zEngineeringNodeBo={ // 工程节点
|
|
|
|
|
|
+ this.zEngineeringNodeBo = { // 工程节点
|
|
type: '', // 节点类型
|
|
type: '', // 节点类型
|
|
- zEngineeringInfoBo: { // 施工信息
|
|
|
|
|
|
+ zEngineeringInfoBo: { // 施工信息
|
|
constructUser: '', // 施工人
|
|
constructUser: '', // 施工人
|
|
- constructTime: '', // 施工时间
|
|
|
|
- zEngiineeringPhotoBoList: [], // 图片列表
|
|
|
|
- zEngineeringMaterialBo: []
|
|
|
|
|
|
+ constructTime: '', // 施工时间
|
|
|
|
+ zEngiineeringPhotoBoList: [], // 图片列表
|
|
|
|
+ zEngineeringMaterialBo: []
|
|
},
|
|
},
|
|
}
|
|
}
|
|
const id = row.id
|
|
const id = row.id
|
|
@@ -606,7 +609,7 @@ export default {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
|
|
this.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
|
|
this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
|
|
this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
|
|
- this.zEngineeringNodeBo.type=this.$route.query.type
|
|
|
|
|
|
+ this.zEngineeringNodeBo.type = this.$route.query.type
|
|
this.$refs.nodeForm.validate(valid => {
|
|
this.$refs.nodeForm.validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
EditEngineeEngineeIndustry(this.form).then(res => {
|
|
EditEngineeEngineeIndustry(this.form).then(res => {
|
|
@@ -791,8 +794,12 @@ export default {
|
|
|
|
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
submitForm() {
|
|
submitForm() {
|
|
- this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
|
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
|
|
|
|
|
|
+ this.form.zEngineeringNodeBo = null
|
|
|
|
+ if (this.zEngineeringNodeBo.type !== '') {
|
|
|
|
+ this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
|
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
|
|
|
|
+ }
|
|
|
|
+ debugger
|
|
this.$refs["form"].validate(valid => {
|
|
this.$refs["form"].validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.form.files = this.$refs.obsFileUpload.fileList;
|
|
this.form.files = this.$refs.obsFileUpload.fileList;
|