Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue

@@ -258,9 +258,10 @@ const submitForm = async (val) => {
     list.value.forEach((item) => {
       totalAmount.value += item.amount
     })
-    amountbool.value = totalAmount.value < formData.value.totalReportAmount
+    amountbool.value = totalAmount.value < formData.value.amount + 0.01
   }
-  if (!amountbool.value&&formData.value.overTask == 0) {
+
+  if (!amountbool.value && formData.value.overTask == 0) {
     message.warning(t('该车间不允许超额报工！'))
     return
   }
@@ -274,6 +275,7 @@ const submitForm = async (val) => {
     await TaskReportApi.createtaskreport(data)
     getDatalist()
     message.success(t('操作成功'))
+    emit('success')
   } finally {
     formLoading.value = false
   }
@@ -295,7 +297,7 @@ const submitForms = async (val) => {
     const data = list.value
     await TaskReportApi.createtaskreport(data)
     message.success(t('生产完成'))
-    dialogVisible.value = false
+    // dialogVisible.value = false
     emit('success')
   } finally {
     formLoading.value = false