|
@@ -147,16 +147,16 @@
|
|
|
<el-form-item label="监理单位" prop="supervisionUnit">
|
|
|
<el-input v-model="form.supervisionUnit" placeholder="请填写监理单位"/>
|
|
|
</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="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-select v-model="form.enginClassification" placeholder="请选择工程分类" style="width: 100%">
|
|
|
<el-option
|
|
@@ -179,12 +179,12 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写节点信息</el-button>
|
|
|
+ <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写施工信息</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <!-- 节点信息dialog -->
|
|
|
- <el-dialog :visible.sync="nodeDetailVisible" :rules="nodeRules" title="节点信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
|
|
|
+ <!-- 施工信息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>-->
|
|
@@ -197,16 +197,16 @@
|
|
|
<!-- </el-tabs>-->
|
|
|
<!-- 节点表单 -->
|
|
|
<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="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="请填写施工地址"></el-input>
|
|
|
</el-form-item>
|
|
@@ -260,10 +260,12 @@
|
|
|
></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-row>
|
|
|
+ <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-row>
|
|
|
<!-- 节点复选框 -->
|
|
|
<!-- <el-checkbox-group v-model="currentNode" @change="currentNodeHasChanged">-->
|
|
|
<!-- <el-checkbox-->
|
|
@@ -330,7 +332,7 @@ export default {
|
|
|
enginClassification: '',
|
|
|
zEngineeringNodeBo: {
|
|
|
type: '',
|
|
|
- zEngineeringInfoBo: {}, //节点信息
|
|
|
+ zEngineeringInfoBo: {}, //施工信息
|
|
|
}
|
|
|
},
|
|
|
zEngineeringInfoBo: {
|
|
@@ -346,7 +348,7 @@ export default {
|
|
|
constructTime: '', // 施工时间
|
|
|
zEngiineeringPhotoBoList: [], // 图片列表
|
|
|
zEngineeringMaterialBo: [],// 用料对象
|
|
|
- }, // 节点信息
|
|
|
+ }, // 施工信息
|
|
|
EngineepipeType: [
|
|
|
{
|
|
|
value: '1',
|
|
@@ -460,9 +462,6 @@ export default {
|
|
|
this.getType();
|
|
|
if (this.form.type === '2') {
|
|
|
this.engineeType = false
|
|
|
- this.nodeType = "市政工程"
|
|
|
- }else {
|
|
|
- this.nodeType = "工业工程"
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -475,6 +474,7 @@ export default {
|
|
|
this.zEngineeringInfoBo.type = type;
|
|
|
this.form.type = type;
|
|
|
this.form.enginType = type;
|
|
|
+ this.nodeType = (type === '2' ? "市政工程" : "工业工程")
|
|
|
}
|
|
|
},
|
|
|
// 新增顶管工程
|
|
@@ -503,7 +503,6 @@ export default {
|
|
|
getEngineeIndustryList({
|
|
|
type: this.form.type
|
|
|
}).then(res => {
|
|
|
- console.log(res)
|
|
|
this.comprehensiveList = res.rows;
|
|
|
this.total = res.total;
|
|
|
this.loading = false;
|
|
@@ -516,12 +515,13 @@ export default {
|
|
|
},
|
|
|
// 表单重置
|
|
|
reset() {
|
|
|
- // this.$nextTick(() => {
|
|
|
- // this.$refs['form'].resetFields()
|
|
|
- // this.$refs['nodeForm'].resetFields()
|
|
|
- // })
|
|
|
- this.resetForm("form");
|
|
|
- this.resetForm("nodeForm");
|
|
|
+ for (let formKey in this.form) {
|
|
|
+ this.form[formKey] = null
|
|
|
+ }
|
|
|
+ for (let formKey in this.zEngineeringInfoBo) {
|
|
|
+ this.zEngineeringInfoBo[formKey] = null
|
|
|
+ }
|
|
|
+ this.getType()
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
@@ -554,7 +554,6 @@ export default {
|
|
|
this.loading = false;
|
|
|
this.form = response.data;
|
|
|
this.zEngineeringInfoBo = response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
|
|
|
- console.log(this.zEngineeringNodeBo)
|
|
|
this.open = true;
|
|
|
this.title = (this.form.type === '1' ? "修改工业工程":"修改市政工程");
|
|
|
});
|