diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index 066aff5..82c605a 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -54,11 +54,11 @@
-
+
+
+
+
+
-
+
+
+
@@ -173,6 +175,7 @@
{
title: '流程提示',
align: 'center',
+ scopedSlots: { customRender: 'describes' },
dataIndex: 'describes'
},
{
diff --git a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
index d0b8bb4..79d0b4d 100644
--- a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
+++ b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
@@ -25,10 +25,10 @@
-
+
+
+
+
@@ -101,6 +100,7 @@
mainId:{
immediate: true,
handler(val) {
+ console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
if(!this.mainId){
this.clearList()
}else{
@@ -203,6 +203,7 @@
{
title:'单价',
align:"center",
+ disabled: this.disabled,
dataIndex: 'materialPrice'
},
/* {