From 618b342965551ba98984634fab0d6a98bdb90ed9 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 19 Feb 2024 10:19:17 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug81875?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CalendarField.vue                            | 6 ++++++
 src/components/PickerDictCheckboxField.vue                  | 6 ++++++
 src/components/PickerDictField.vue                          | 6 ++++++
 src/components/PickerField.vue                              | 1 +
 src/components/SelectDepartmentField.vue                    | 1 +
 src/components/SelectUserByWorkGroupField.vue               | 1 +
 src/components/TreeSelectMultiple.vue                       | 1 +
 .../module/StandardizationCheckBaseInfo.vue                 | 1 +
 8 files changed, 23 insertions(+)

diff --git a/src/components/CalendarField.vue b/src/components/CalendarField.vue
index 389e6be..6b0528c 100644
--- a/src/components/CalendarField.vue
+++ b/src/components/CalendarField.vue
@@ -4,6 +4,7 @@
     <van-field
       readonly
       :class="readonly ? 'field-readonly' : 'not-field-readonly'"
+      :required="rules ? rules[0].required : false"
       clickable
       type="text"
       name="calendar"
@@ -33,6 +34,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    rules: {
+      type: [Array, null],
+      required: false,
+      default: null
     }
   },
   data () {
diff --git a/src/components/PickerDictCheckboxField.vue b/src/components/PickerDictCheckboxField.vue
index 9771a44..c19f4b4 100644
--- a/src/components/PickerDictCheckboxField.vue
+++ b/src/components/PickerDictCheckboxField.vue
@@ -4,6 +4,7 @@
     <van-field
       readonly
       :class="readonly ? 'field-readonly' : 'not-field-readonly'"
+      :required="rules ? rules[0].required : false"
       clickable
       name="picker"
       :value="showValue"
@@ -70,6 +71,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    rules: {
+      type: [Array, null],
+      required: false,
+      default: null
     }
   },
   data () {
diff --git a/src/components/PickerDictField.vue b/src/components/PickerDictField.vue
index 4064653..bb1dfbc 100644
--- a/src/components/PickerDictField.vue
+++ b/src/components/PickerDictField.vue
@@ -4,6 +4,7 @@
     <van-field
       readonly
       :class="readonly ? 'field-readonly' : 'not-field-readonly'"
+      :required="rules ? rules[0].required : false"
       clickable
       name="picker"
       :value="showValue"
@@ -54,6 +55,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    rules: {
+      type: [Array, null],
+      required: false,
+      default: null
     }
   },
   data () {
diff --git a/src/components/PickerField.vue b/src/components/PickerField.vue
index cf06b7f..9c8af28 100644
--- a/src/components/PickerField.vue
+++ b/src/components/PickerField.vue
@@ -10,6 +10,7 @@
       v-bind="$attrs"
       v-on="childListeners"
       @click="showPickerFunc"
+      :required="rules ? rules[0].required : false"
       :rules="rules"
     />
     <van-popup v-model="showPicker" style="height: 50vh" :class="{'dict-checkbox-field-popup': multiple}" position="bottom">
diff --git a/src/components/SelectDepartmentField.vue b/src/components/SelectDepartmentField.vue
index 24b6d27..6925c85 100644
--- a/src/components/SelectDepartmentField.vue
+++ b/src/components/SelectDepartmentField.vue
@@ -8,6 +8,7 @@
       @click="showPopup"
       v-model="departmentNames"
       :rules="rules"
+      :required="rules ? rules[0].required : false"
       rows="1"
       autosize
       :placeholder="placeholder || $t('clickSelect') + label"
diff --git a/src/components/SelectUserByWorkGroupField.vue b/src/components/SelectUserByWorkGroupField.vue
index a52b2e0..0bf17b5 100644
--- a/src/components/SelectUserByWorkGroupField.vue
+++ b/src/components/SelectUserByWorkGroupField.vue
@@ -6,6 +6,7 @@
       :placeholder="$t('pleaseSelect') + label"
       readonly
       :class="readonly ? 'field-readonly' : 'not-field-readonly'"
+      :required="rules ? rules[0].required : false"
       rows="1"
       autosize
       :rules="rules"
diff --git a/src/components/TreeSelectMultiple.vue b/src/components/TreeSelectMultiple.vue
index 14f13d4..80d66ff 100644
--- a/src/components/TreeSelectMultiple.vue
+++ b/src/components/TreeSelectMultiple.vue
@@ -7,6 +7,7 @@
       clearable
       @click="showPopup"
       v-model="showValue"
+      :required="rules ? rules[0].required : false"
       rows="1"
       autosize
       type="textarea"
diff --git a/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue
index 449317a..3ec6da8 100644
--- a/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue
@@ -56,6 +56,7 @@
             v-model="formInline.reviewPlace"
             :label="$t('enStandardRevision.judgingVenue')"
             :placeholder="$t('pleaseEnter') + $t('enStandardRevision.judgingVenue')"
+            :required="baseInfoRule.reviewPlace ? baseInfoRule.reviewPlace[0].required : false"
             type="textarea"
             autosize
             rows="1"