diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index de49020..a7fa191 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 046ef92..f540cbb 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -86,7 +86,7 @@
-
+
@@ -457,7 +457,7 @@
{
rowKey: record.row.id,
values: {
- 'materialAmount': record.row.materialPrice * record.row.materialQuantity
+ 'materialAmount': parseFloat((record.row.materialPrice * record.row.materialQuantity).toFixed(1)),
}
}
]
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index a203d96..496fef4 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -55,7 +55,7 @@
-
+
@@ -586,7 +586,7 @@
// 'materialPrice': res.price,
// 'number': res.number,
'allotNumber': res.allotNumber,
- 'materialAmount': res.materialPrice * parseInt(res.allotNumber)
+ 'materialAmount': parseFloat((res.materialPrice * parseInt(res.allotNumber)).toFixed(1)),
}
}
]
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 8d7bdb0..010d9ef 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -61,7 +61,7 @@
-->
-
+
diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
index a570bc4..6014578 100644
--- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index bf752b6..aabe826 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -69,7 +69,7 @@
-
+
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 1d1e2d0..5779dfa 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -42,7 +42,7 @@
-
+
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index bf63137..576ee1c 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -40,7 +40,7 @@
-
+
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 28a264c..d864d32 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1,7 +1,7 @@
-
+
@@ -1033,7 +1033,7 @@
'materialSeries': record.row.materialSeries,
'materialName': record.row.materialName,
'materialUnit': record.row.materialUnit,
- 'materialAmount': record.row.materialQuantity * record.row.materialPrice,
+ 'materialAmount': parseFloat((record.row.materialQuantity * record.row.materialPrice).toFixed(1)),
'materialType': this.data.materialType
}
}
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 91fd761..ded076c 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -472,6 +472,8 @@
}
})
}
+ this.form.comment=null;
+ this.form.userId=null;
},
async detail(r) {
if (!r.routeName) {