From 7d215f559b3af994c170d4efd1e550ef937840e4 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Tue, 14 Feb 2023 15:06:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=202.?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=9B=9E=E6=98=BE=E5=A4=9A=E9=80=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomForm/FormItemSelf.vue               | 20 ++++++++++++++++++-
 .../CustomForm/FormItemText.vue               |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index f3bc7ca..7e7c311 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -798,6 +798,13 @@ export default {
                           message: "请选择" + targetItem.label,
                         },
                       ]
+                    } else if (targetItem.type == "upload") {
+                      targetItem.rules = [
+                        {
+                          required: true,
+                          message: "请上传" + targetItem.label,
+                        },
+                      ]
                     } else {
                       targetItem.rules = [
                         {
@@ -829,13 +836,24 @@ export default {
                       if (filterArr.includes(targetItem.column[index].prop)) {
                         return
                       }
-                      if (targetItem.column[index].type == "checkbox") {
+                      if (
+                        targetItem.column[index].type == "checkbox" ||
+                        targetItem.column[index].type == "date" ||
+                        targetItem.column[index].type == "radio"
+                      ) {
                         targetItem.column[index].rules = [
                           {
                             required: true,
                             message: "请选择" + targetItem.column[index].label,
                           },
                         ]
+                      } else if (targetItem.column[index].type == "upload") {
+                        targetItem.rules = [
+                          {
+                            required: true,
+                            message: "请上传" + targetItem.column[index].label,
+                          },
+                        ]
                       } else {
                         targetItem.column[index].rules = [
                           {
diff --git a/src/components/FormComponents/CustomForm/FormItemText.vue b/src/components/FormComponents/CustomForm/FormItemText.vue
index e9262da..8da2ed0 100644
--- a/src/components/FormComponents/CustomForm/FormItemText.vue
+++ b/src/components/FormComponents/CustomForm/FormItemText.vue
@@ -28,7 +28,7 @@
           {{ unionName }}
         </span>
         <span v-else style="margin: 0 5px">{{
-          String(form[item.prop]) | getItemText(item.dicData, item.type)
+          form[item.prop] | getItemText(item.dicData, item.type)
         }}</span>
       </span>
       <span v-if="item.append && !item.toothBit" class="append">{{
-- 
2.22.0