From d2ce42d398d7ffd7bcdf5d5d029f7f8405a3da37 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 21 Jan 2025 15:23:29 +0800
Subject: [PATCH] 1

---
 src/utils/formBuilder.js             | 28 ++++++++--------------------
 src/views/flow/components/assign.vue |  4 ++--
 src/views/flow/list.vue              | 12 +++++++++++-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index da2df4d..f174e50 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -140,10 +140,12 @@ export default function formBuilder(
                 ? target[info.name]
                     .toString()
                     ?.split(/,|\|/)
-                    .map((i) => (isNaN(Number(i) || !i) ? i : Number(i)))
+                    .map((i) => {
+                      return ((isNaN(Number(i)) || !i) ? i : Number(i))
+                    })
                 : [];
             } else {
-              return isNaN(Number(target[info.name])) || !target[info.name]
+              return (isNaN(Number(target[info.name])) || !target[info.name])
                 ? target[info.name]
                 : Number(target[info.name]);
             }
@@ -666,11 +668,11 @@ export default function formBuilder(
                 ? target[info.name]
                     .toString()
                     ?.split(/,|\|/)
-                    .map((i) => (isNaN(Number(i)) || !i ? i : Number(i)))
+                    .map((i) => ((isNaN(Number(i)) || !i) ? i : Number(i)))
                 : [];
             } else {
               res =
-                isNaN(Number(target[info.name])) || !target[info.name]
+                (isNaN(Number(target[info.name])) || !target[info.name])
                   ? target[info.name]
                   : Number(target[info.name]);
             }
@@ -1121,20 +1123,6 @@ export default function formBuilder(
           break;
         case "choice":
         case "select":
-          // const getMoblieSelectValue = () => {
-          //   if (!!info.multiple) {
-          //     return target[info.name]
-          //       ? target[info.name]
-          //           .toString()
-          //           ?.split(/,|\|/)
-          //           .map((i) => (isNaN(Number(i) || !i) ? i : Number(i)))
-          //       : [];
-          //   } else {
-          //     return isNaN(Number(target[info.name])) || !target[info.name]
-          //       ? target[info.name]
-          //       : Number(target[info.name]);
-          //   }
-          // };
           const getDetailMobileSelectValue = () => {
             let res = "";
             if (!!info.multiple) {
@@ -1142,11 +1130,11 @@ export default function formBuilder(
                 ? target[info.name]
                   .toString()
                   ?.split(/,|\|/)
-                  .map((i) => (isNaN(Number(i)) || !i ? i : Number(i)))
+                  .map((i) => ((isNaN(Number(i)) || !i) ? i : Number(i)))
                 : [];
             } else {
               res =
-                isNaN(Number(target[info.name])) || !target[info.name]
+                (isNaN(Number(target[info.name])) || !target[info.name])
                   ? target[info.name]
                   : Number(target[info.name]);
             }
diff --git a/src/views/flow/components/assign.vue b/src/views/flow/components/assign.vue
index 66b61bb..d09ad70 100644
--- a/src/views/flow/components/assign.vue
+++ b/src/views/flow/components/assign.vue
@@ -254,7 +254,7 @@ export default {
             await Promise.all(this.multipleIds.map(i => assign(i)))
           } else {
             await assign(this.result.id)
-            this.$router.push("/flow/list/handled");
+            this.$router.push("/flow/list/todo");
           }
         } else {
           if (typeof this.form.user_id === 'number') {
@@ -273,7 +273,7 @@ export default {
             await Promise.all(this.multipleIds.map(i => assign(i, this.form)))
           } else {
             await assign(this.result.id, this.form)
-            this.$router.push("/flow/list/handled");
+            this.$router.push("/flow/list/todo");
           }
         }
         this.$emit('update:visible', false)
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index 5a11771..74281dd 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -301,7 +301,17 @@
                   >撤回</el-button
                   >
                   <el-button
-                    v-if="row.can_delete || ($store.state.user.adminId === 1)"
+                    v-if="row.can_delete"
+                    plain
+                    type="danger"
+                    size="mini"
+                    @click="destroy(row)"
+                  >删除</el-button
+                  >
+                </template>
+                <template v-else>
+                  <el-button
+                    v-if="$store.state.user.adminId === 1"
                     plain
                     type="danger"
                     size="mini"