|
@@ -208,6 +208,18 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="文件" prop="" v-if="currentType==='put'">
|
|
|
+ <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999" :value="form.pics"
|
|
|
+ ></ObsFileUpload>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="文件" prop="" v-if="currentType==='add'">
|
|
|
+ <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999" :value="form.files"
|
|
|
+ ></ObsFileUpload>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </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"-->
|
|
@@ -245,9 +257,7 @@
|
|
|
style="width: 100%"
|
|
|
placeholder="请选择施工时间">
|
|
|
</el-date-picker>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
- {{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>
|
|
@@ -305,36 +315,6 @@
|
|
|
<!-- </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="form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList"
|
|
@@ -434,6 +414,8 @@ export default {
|
|
|
nodeDetailVisible: false, // 施工信息dialog
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
+ files:[], // 附件
|
|
|
+ pics:[], // 附件返回
|
|
|
type:'', // 用来区分工业工程、市政工程
|
|
|
enginName:'', // 工程名称
|
|
|
enginType:'', // 工程类型
|
|
@@ -458,9 +440,11 @@ export default {
|
|
|
constructTime: '', // 施工时间
|
|
|
zEngiineeringPhotoBoList: [], // 图片列表
|
|
|
zEngineeringMaterialBo: [ // 用料对象
|
|
|
- {materialQuality: ''}, // 用料材质
|
|
|
- {specifications: ''}, // 用料规格
|
|
|
- {number: ''}, // 用料数量
|
|
|
+ {
|
|
|
+ materialQuality: '', // 用料材质
|
|
|
+ specifications: '', // 用料规格
|
|
|
+ number: '' // 用料数量
|
|
|
+ },
|
|
|
],
|
|
|
},
|
|
|
},
|
|
@@ -530,7 +514,8 @@ export default {
|
|
|
// {required: true, message: "图片不能为空", trigger: 'blur'}
|
|
|
// ],
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+ currentType: null, // 附件组件类型 put修改 add新增
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -543,15 +528,14 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
// addzEngineeringMaterialBo(){
|
|
|
- // this.zEngineeringInfoBo.zEngineeringMaterialBo.push({
|
|
|
+ // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo.push({
|
|
|
// materialQuality: '', // 用料材质
|
|
|
// specifications: '', // 用料规格
|
|
|
// number: '' // 用料数量
|
|
|
// })
|
|
|
- // console.log(this.zEngineeringInfoBo.zEngineeringMaterialBo)
|
|
|
// },
|
|
|
// removezEngineeringMaterialBo(item, index){
|
|
|
- // this.zEngineeringInfoBo.zEngineeringMaterialBo.splice(index, 1)
|
|
|
+ // this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo.splice(index, 1)
|
|
|
// },
|
|
|
// 根据url获取type节点类型
|
|
|
getType() {
|
|
@@ -577,6 +561,7 @@ export default {
|
|
|
toNodeDetail() {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
+ this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
this.nodeDetailVisible = true
|
|
|
}
|
|
|
})
|
|
@@ -633,8 +618,9 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
- this.open = true;
|
|
|
this.title = (this.form.type === '1' ? "新增工业工程":"新增市政工程");
|
|
|
+ this.currentType = 'add'
|
|
|
+ this.open = true;
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
@@ -644,10 +630,11 @@ export default {
|
|
|
putEngineeEngineeIndustry(id).then(response => {
|
|
|
this.loading = false;
|
|
|
this.form = response.data;
|
|
|
- this.form.zEngineeringNodeBo = response.data.zengineeringNodeBo[0]
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zengineeringNodeBo[0].zEngineeringInfoBoList[0]
|
|
|
- this.open = true;
|
|
|
+ this.form.zEngineeringNodeBo = response.data.zengineeringNodeBoList[0]
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zengineeringNodeBoList[0].zEngineeringInfoBoList[0]
|
|
|
this.title = (this.form.type === '1' ? "修改工业工程":"修改市政工程");
|
|
|
+ this.currentType = 'put'
|
|
|
+ this.open = true;
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|