|
@@ -180,8 +180,8 @@
|
|
|
<!-- 节点信息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="zEngineeringInfoBo.nodeType" placeholder="请填写节点类型" disabled></el-input>
|
|
|
+ <el-form-item label="节点类型" prop="type">
|
|
|
+ <el-input v-model="zEngineeringInfoBo.type" placeholder="请填写节点类型" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="施工地址" prop="constructAddre">
|
|
|
<el-input v-model="zEngineeringInfoBo.constructAddre" placeholder="请填写施工地址"></el-input>
|
|
@@ -352,16 +352,16 @@
|
|
|
supervisionPhone:'', // 监理联系电话
|
|
|
constructUnit:'', // 建筑单位
|
|
|
supervisionUnit:"", // 监理单位
|
|
|
- type:'01', // 类型 01工业工程 02市政工程
|
|
|
+ type:'1', // 类型 1工业工程 2市政工程
|
|
|
enginType:'', // 工程类型 民用工程 0 ,市政工程 1,工业工程 2 ,顶管工程 3,危险作业工程 4,基建工程 5
|
|
|
remark:'', // 备注
|
|
|
zEngineeringNodeBo:{
|
|
|
- type:'01',
|
|
|
+ type:'',
|
|
|
zEngineeringInfoBo:{}, //节点信息
|
|
|
}
|
|
|
},
|
|
|
zEngineeringInfoBo:{
|
|
|
- nodeType:'', // 节点类型
|
|
|
+ type:'', // 节点类型
|
|
|
constructAddre:'', // 施工地址
|
|
|
constructPhone:'', // 施工人电话
|
|
|
constructUser:'', // 施工人
|
|
@@ -373,7 +373,6 @@
|
|
|
constructTime:'', // 施工时间
|
|
|
zEngiineeringPhotoBoList:[], // 图片列表
|
|
|
zEngineeringMaterialBo:[],// 用料对象
|
|
|
-
|
|
|
}, // 节点信息
|
|
|
constructAccordingDrawingsOption:[
|
|
|
{
|
|
@@ -415,7 +414,7 @@
|
|
|
{ required: true, message: "监理单位不能为空" ,trigger: 'blur'}
|
|
|
],
|
|
|
enginType: [
|
|
|
- { required: true, message: "现场负责人不能为空" ,trigger: 'blur'}
|
|
|
+ { required: true, message: "工程类型不能为空" ,trigger: 'blur'}
|
|
|
],
|
|
|
supervisionPhone: [
|
|
|
{ required: true, message: "建立联系电话不能为空" ,trigger: 'blur'}
|
|
@@ -459,7 +458,7 @@
|
|
|
},
|
|
|
// 节点规则校验
|
|
|
nodeRules:{
|
|
|
- nodeType: [
|
|
|
+ type: [
|
|
|
{ required: true, message: "节点类型不能为空" ,trigger: 'blur'}
|
|
|
],
|
|
|
constructAddre: [
|
|
@@ -483,17 +482,18 @@
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
- // 根据url获取nodeType节点类型
|
|
|
+ // 根据url获取type节点类型
|
|
|
this.getType();
|
|
|
},
|
|
|
methods: {
|
|
|
- // 根据url获取nodeType节点类型
|
|
|
+ // 根据url获取type节点类型
|
|
|
getType() {
|
|
|
const queryString = window.location.search;
|
|
|
const params = new URLSearchParams(queryString);
|
|
|
const type = params.get('type');
|
|
|
if (type) {
|
|
|
- this.zEngineeringInfoBo.nodeType = type;
|
|
|
+ this.zEngineeringInfoBo.type = type;
|
|
|
+ this.form.type = type;
|
|
|
}
|
|
|
},
|
|
|
// 新增顶管工程
|
|
@@ -506,7 +506,11 @@
|
|
|
this.nodeDetailVisible = false
|
|
|
},
|
|
|
toNodeDetail(){
|
|
|
- this.nodeDetailVisible = true
|
|
|
+ this.$refs["form"].validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ this.nodeDetailVisible = true
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
getUrl(url) {
|
|
|
this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList?this.$refs.obsImageUpload.fileList.map(e=>e.url):[];
|
|
@@ -515,7 +519,7 @@
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
getEngineeIndustryList({
|
|
|
- type:'01'
|
|
|
+ type: this.form.type
|
|
|
}).then(res => {
|
|
|
console.log(res)
|
|
|
this.comprehensiveList = res.rows;
|
|
@@ -577,8 +581,10 @@
|
|
|
this.$refs["nodeForm"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.id == null){
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
console.log(this.form)
|
|
|
+ this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
|
|
|
addEngineeEngineeIndustry(this.form).then(res => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
@@ -586,14 +592,15 @@
|
|
|
this.getList();
|
|
|
})
|
|
|
}else {
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
+ this.form.zEngineeringNodeBo = this.zEngineeringInfoBo
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo = {}
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngiineeringPhotoBoList
|
|
|
EditEngineeEngineeIndustry(this.form).then(res=>{
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.nodeDetailVisible = false
|
|
|
this.getList();
|
|
|
})
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
});
|