From 8876f1226e9087042d649b262c7a4e34238873d8 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sun, 5 Nov 2023 15:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E7=89=B9=E9=82=80?=
 =?UTF-8?q?=E5=98=89=E5=AE=BE=E3=80=81=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingActivity/modules/CooperativeForm.vue | 17 +++++++++++++++--
 .../meetingActivity/modules/SpeakGuestForm.vue  |  1 -
 .../meetingActivity/modules/TeyaoGuestForm.vue  | 14 +++++++++++++-
 src/views/meetingActivity/modules/VipForm.vue   |  1 -
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/views/meetingActivity/modules/CooperativeForm.vue b/src/views/meetingActivity/modules/CooperativeForm.vue
index a157120..6d98234 100644
--- a/src/views/meetingActivity/modules/CooperativeForm.vue
+++ b/src/views/meetingActivity/modules/CooperativeForm.vue
@@ -130,7 +130,19 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row  :gutter="24" style="transform: translateX(-4px)">
+        <a-col>
+          <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+            <a-textarea
+              placeholder="请输入备注"
+              :auto-size="{ minRows: 3, maxRows: 6 }"
+              v-decorator="['remark']"
+              :maxLength='200'
+              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+          </a-form-item>
+        </a-col>
 
+      </a-row>
 
 
     </a-form>
@@ -141,8 +153,8 @@
 import JDate from '@comp/jero/JDate'
 import moment from 'moment'
 import {httpAction} from '@api/manage'
-import WasicTopicData from "../../MessagePage/modules/wasicStaticData";
-import {LinkTopicsEnums} from "../../../enums/commonEnum";
+import WasicTopicData from '../../MessagePage/modules/wasicStaticData'
+import {LinkTopicsEnums} from '../../../enums/commonEnum'
 
 export default {
   name: 'CooperativeForm',
@@ -308,6 +320,7 @@ export default {
         'guestType':record.guestType,
         'arrivalTime':record.arrivalTime,
         'departureTime':record.departureTime,
+        'remark':record.remark
       })
     },
     /*
diff --git a/src/views/meetingActivity/modules/SpeakGuestForm.vue b/src/views/meetingActivity/modules/SpeakGuestForm.vue
index 782f1d7..b3fdc7b 100644
--- a/src/views/meetingActivity/modules/SpeakGuestForm.vue
+++ b/src/views/meetingActivity/modules/SpeakGuestForm.vue
@@ -524,7 +524,6 @@ export default {
           'checkInHotel',
           'pickUp',
           'deliveryStation',
-          'peer',
           'remark'
         ))
       })
diff --git a/src/views/meetingActivity/modules/TeyaoGuestForm.vue b/src/views/meetingActivity/modules/TeyaoGuestForm.vue
index a50e9fb..37c2f17 100644
--- a/src/views/meetingActivity/modules/TeyaoGuestForm.vue
+++ b/src/views/meetingActivity/modules/TeyaoGuestForm.vue
@@ -175,6 +175,19 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row  :gutter="24" style="transform: translateX(-4px)">
+        <a-col>
+          <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+            <a-textarea
+              placeholder="请输入备注"
+              :auto-size="{ minRows: 3, maxRows: 6 }"
+              v-decorator="['remark']"
+              :maxLength='200'
+              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+          </a-form-item>
+        </a-col>
+
+      </a-row>
 
     </a-form>
   </a-spin>
@@ -469,7 +482,6 @@ export default {
           'checkInHotel',
           'pickUp',
           'deliveryStation',
-          'peer',
           'remark'
         ))
       })
diff --git a/src/views/meetingActivity/modules/VipForm.vue b/src/views/meetingActivity/modules/VipForm.vue
index 64ab930..54bef5c 100644
--- a/src/views/meetingActivity/modules/VipForm.vue
+++ b/src/views/meetingActivity/modules/VipForm.vue
@@ -582,7 +582,6 @@ export default {
           'checkInHotel',
           'pickUp',
           'deliveryStation',
-          'peer',
           'remark'
         ))
       })