From 435e45da8963ef4f5877a2728e3adb1b7f3b6e48 Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Fri, 10 Mar 2023 14:01:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E5=80=BC=E4=B8=BA0?=
 =?UTF-8?q?=E6=97=B6=E9=94=99=E8=AF=AF=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/process/components/detail.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index ef84e4e..b2dd04d 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -149,7 +149,7 @@ export default {
           const { option, vars } = this.handleResolveOption(eval('(' + allForm + ')'), taskForm, status)
           option.menuBtn = false
           for (let key in variables) {
-            if (!variables[key]) delete variables[key]
+            if (!this.validatenull(variables[key])) delete variables[key]
           }
           if (option.column && process.variables && process.variables.serialNumber) {
             option.column.unshift({
@@ -221,13 +221,16 @@ export default {
           if (valid) {
             const variables = {}
             this.vars.forEach(v => {
-              if (v != 'comment' && this.form[v]) variables[v] = this.form[v]
+              if (!this.validatenull(this.form[v])) {
+                variables[v] = this.form[v]
+                if (this.form[`$${v}`]) variables[`$${v}`] = this.form[`$${v}`]
+              }
             })
 
             this.handleCompleteTask(pass, variables).then(() => {
               this.$message.success("处理成功")
               this.handleCloseTag('/plugin/workflow/process/todo')
-            }).catch(() => {
+            }).catch(() => { 
               if (typeof done == 'function') done()
               this.submitLoading = false
             })