|
@@ -296,8 +296,8 @@
|
|
ref="ConstructionDetails"
|
|
ref="ConstructionDetails"
|
|
:status="status"
|
|
:status="status"
|
|
:currentCollapses="currentCollapses"
|
|
:currentCollapses="currentCollapses"
|
|
- @updateNodeOption = "updateNodeOption"
|
|
|
|
- enginType="工业工程"
|
|
|
|
|
|
+ @updateNodeOption="updateNodeOption"
|
|
|
|
+ :enginType="this.$route.query.type == '1' ? '工业工程' : '市政工程'"
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -343,7 +343,7 @@ export default {
|
|
loading: true,
|
|
loading: true,
|
|
// 选中数组
|
|
// 选中数组
|
|
ids: [],
|
|
ids: [],
|
|
- status:null,
|
|
|
|
|
|
+ status: null,
|
|
// 非单个禁用
|
|
// 非单个禁用
|
|
single: true,
|
|
single: true,
|
|
// 非多个禁用
|
|
// 非多个禁用
|
|
@@ -478,9 +478,9 @@ export default {
|
|
{required: true, message: "图片不能为空", trigger: ['change', 'blur'], validator: validatePicPass}
|
|
{required: true, message: "图片不能为空", trigger: ['change', 'blur'], validator: validatePicPass}
|
|
],
|
|
],
|
|
},
|
|
},
|
|
- searchParams:{
|
|
|
|
- enginName:null, // 工程名称
|
|
|
|
- enginClassification:null, // 工程分类
|
|
|
|
|
|
+ searchParams: {
|
|
|
|
+ enginName: null, // 工程名称
|
|
|
|
+ enginClassification: null, // 工程分类
|
|
},
|
|
},
|
|
currentType: null, // 附件组件类型 put修改 add新增
|
|
currentType: null, // 附件组件类型 put修改 add新增
|
|
};
|
|
};
|
|
@@ -494,10 +494,10 @@ export default {
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
- // 手动渲染
|
|
|
|
- // setInterval(() => {
|
|
|
|
- // this.$forceUpdate()
|
|
|
|
- // }, 500)
|
|
|
|
|
|
+ // 获取材质
|
|
|
|
+ getEnginMaterialQualityList({enginType: this.$route.query.type == '1' ? '工业工程' : '市政工程'}).then(res => {
|
|
|
|
+ this.materialQualityList = res.data
|
|
|
|
+ });
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
validateState(rule, value, callback) {
|
|
validateState(rule, value, callback) {
|
|
@@ -535,7 +535,7 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- updateNodeOption(value){
|
|
|
|
|
|
+ updateNodeOption(value) {
|
|
console.log(this.form);
|
|
console.log(this.form);
|
|
console.log(value)
|
|
console.log(value)
|
|
this.form.files = this.form.pics
|
|
this.form.files = this.form.pics
|
|
@@ -556,6 +556,7 @@ export default {
|
|
},
|
|
},
|
|
//添加用料信息
|
|
//添加用料信息
|
|
addzEngineeringMaterBo(row) {
|
|
addzEngineeringMaterBo(row) {
|
|
|
|
+
|
|
const id = row.id
|
|
const id = row.id
|
|
putEngineeEngineeIndustry(id).then(response => {
|
|
putEngineeEngineeIndustry(id).then(response => {
|
|
this.loading = false;
|
|
this.loading = false;
|
|
@@ -675,11 +676,6 @@ export default {
|
|
/** 查询市政工程|工业工程列表 */
|
|
/** 查询市政工程|工业工程列表 */
|
|
getList(val) {
|
|
getList(val) {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- let enginType = this.form.zEngineeringNodeBo.type;
|
|
|
|
- // 获取材质
|
|
|
|
- getEnginMaterialQualityList({enginType}).then(res => {
|
|
|
|
- this.materialQualityList = res.data
|
|
|
|
- });
|
|
|
|
getEngineeIndustryList(val || {}).then(res => {
|
|
getEngineeIndustryList(val || {}).then(res => {
|
|
this.comprehensiveList = res.rows;
|
|
this.comprehensiveList = res.rows;
|
|
this.total = res.total;
|
|
this.total = res.total;
|