From c27a2155a005219ebf0c215bdf915b8de7a44997 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 2 Aug 2024 10:05:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=A4=96=E6=A0=87=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=B9=9F=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=96=B0=E5=A2=9E=E6=97=A5=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E5=BE=80=E5=90=8E=E9=9D=A2=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JMultipleDatePicker.vue                    | 1 +
 src/components/customField/AddForm.vue                    | 8 ++++----
 .../overseasStandard/modules/OverseasStandardModal.vue    | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/JMultipleDatePicker.vue b/src/components/JMultipleDatePicker.vue
index 05edb429..69668423 100644
--- a/src/components/JMultipleDatePicker.vue
+++ b/src/components/JMultipleDatePicker.vue
@@ -145,6 +145,7 @@ export default {
         this.checkedValue = checkedValue.sort((date1, date2) => {
           return new Date(date1) - new Date(date2)
         })
+        this.$emit('addDate', currentStr, this.fieldName)
       } else {
         console.log('减日期')
         this.checkedValue = this.checkedValue.filter(item => item !== currentStr)
diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 746eb947..feaae7f2 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -44,7 +44,7 @@
                                         v-model="formInline[item.dbFieldName]"
                                         :fieldName="item.dbFieldName"
                                         :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
-                                        @change="multipleDateChange"/>
+                                        @addDate="multipleAddDate"/>
                 <!--   5, 多行文本  -->
                 <a-textarea v-else-if="item.fieldShowType === FieldType.TEXTAREA.value"
                             :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
@@ -773,11 +773,11 @@ export default {
       // this.formInline[value + '_by'] = id
       this.formInline = { ...this.formInline }
     },
-    // 多选日期改变
-    multipleDateChange (value, fieldName) {
+    // 多选日期添加了日期
+    multipleAddDate (value, fieldName) {
       if (this.needSyncRemarksDataField.includes(fieldName)) {
         // 有关联字段需要更新
-        this.formInline[fieldName + '_remarks'] = value
+        this.formInline[fieldName + '_remarks'] = (this.formInline[fieldName + '_remarks'] ? (this.formInline[fieldName + '_remarks'] + ',') : '') + value
         this.formInline = { ...this.formInline }
       }
     },
diff --git a/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue
index b69c3166..b3d7f729 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue
@@ -21,6 +21,7 @@
                   :disabled-field-list="disabledField"
                   :open-selected-all-field-list="openSelectedAllFieldList"
                   :exclude-standard-fields="excludeStandardFields"
+                  :needSyncRemarksDataField="['new_model_implementation_date', 'on_the_production_date']"
                   @submitFormData="submitFormData" />
       </a-spin>
     </div>