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

---
 .../meetManage/AddOrDetailMeet.vue            | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 454ac07..90732de 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -183,6 +183,74 @@
 
           <!--会议信息end-->
 
+          <!--    会议问题征集--只有标协会议存在      -->
+          <section v-if="meetingType === '2' && (tbMeetingType === 1 || tbMeetingType === 2)" >
+            <!--  选择是否需要问题征集-->
+            <a-row :gutter="24">
+              <a-col :xxl="8" :xl="12" :sm="24">
+                <a-form-item label="问题征集" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-radio-group v-decorator="['isAddQuestion',validatorRules.isAddQuestion]"
+                                 @change="changeIsAddQuestion">
+                    <a-radio :value="1">需要</a-radio>
+                    <a-radio :value="0">不需要</a-radio>
+                  </a-radio-group>
+                </a-form-item>
+              </a-col>
+              <a-col :xxl="8" :xl="12" :sm="24" v-if="isAddQuestion">
+                <a-form-item label="征集截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-date
+                    placeholder="请选择征集截止时间"
+                    style="width: 100%;"
+                    v-decorator="['endTimeAddQuestion',validatorRules.endTimeAddQuestion]"
+                    :trigger-change="true"
+                    date-format="YYYY-MM-DD HH:mm:00"
+                    :show-time="true"
+                  />
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <div class="item-title" v-if="isAddQuestion" >问题征集列表</div>
+            <!-- 问题征集的详细信息-->
+            <section v-if="isAddQuestion">
+              <a-row :gutter="24" v-for="(question, index) in model.questionList" :key="index">
+                <!-- 存儲初始化的id-->
+                <a-col v-show="false">
+                  <a-form-item :label="'标准号id ' + (index + 1) " :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="event => event.target.value = event.target.value.trim()"
+                      :maxLength="50"
+                      v-decorator="['questionList['+index+'].id']"
+                      placeholder="请输入标准号id"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="8" :xl="10"  :sm="24">
+                  <a-form-item :label="'标准号 ' + (index + 1) " :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="event => event.target.value = event.target.value.trim()"
+                      :maxLength="50"
+                      v-decorator="['questionList['+index+'].standardNumber', validatorRules.standardNumber]"
+                      placeholder="请输入标准号"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="8" :xl="10"  :sm="24">
+                  <a-form-item label="标准名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      @change="event => event.target.value = event.target.value.trim()"
+                      :maxLength="50"
+                      v-decorator="['questionList['+index+'].standardName',validateInviteCode.standardName]"
+                      placeholder="请输入标准名称"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="8" :xl="4" :sm="24">
+                  <a-form-item>
+                    <a-button icon="plus" @click="addQuestionNew"></a-button>
+                    <a-button icon="minus" @click="removeQuestion(index)" style="margin-left: 8px;"></a-button>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </section>
+          </section>
+
           <!--  标准项目,2024-2月变更，标协会议增加标准项目面板，标协会议类型为标准宣贯、学习培训加 -->
           <section v-if="meetingType === '2' && (tbMeetingType === 1 || tbMeetingType === 2)">
             <div class="item-title">标准项目</div>
@@ -272,74 +340,6 @@
           </section>
           <!--  标准项目end -->
 
-          <!--    会议问题征集--只有标协会议存在      -->
-          <section v-if="meetingType === '2' && (tbMeetingType === 1 || tbMeetingType === 2)" >
-            <!--  选择是否需要问题征集-->
-            <a-row :gutter="24">
-              <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="问题征集" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-radio-group v-decorator="['isAddQuestion',validatorRules.isAddQuestion]"
-                                 @change="changeIsAddQuestion">
-                    <a-radio :value="1">需要</a-radio>
-                    <a-radio :value="0">不需要</a-radio>
-                  </a-radio-group>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="8" :xl="12" :sm="24" v-if="isAddQuestion">
-                <a-form-item label="征集截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <j-date
-                    placeholder="请选择征集截止时间"
-                    style="width: 100%;"
-                    v-decorator="['endTimeAddQuestion',validatorRules.endTimeAddQuestion]"
-                    :trigger-change="true"
-                    date-format="YYYY-MM-DD HH:mm:00"
-                    :show-time="true"
-                  />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <div class="item-title" v-if="isAddQuestion" >问题征集列表</div>
-            <!-- 问题征集的详细信息-->
-            <section v-if="isAddQuestion">
-              <a-row :gutter="24" v-for="(question, index) in model.questionList" :key="index">
-                <!-- 存儲初始化的id-->
-                <a-col v-show="false">
-                  <a-form-item :label="'标准号id ' + (index + 1) " :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      :maxLength="50"
-                      v-decorator="['questionList['+index+'].id']"
-                      placeholder="请输入标准号id"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :xxl="8" :xl="10"  :sm="24">
-                  <a-form-item :label="'标准号 ' + (index + 1) " :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      :maxLength="50"
-                      v-decorator="['questionList['+index+'].standardNumber', validatorRules.standardNumber]"
-                      placeholder="请输入标准号"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :xxl="8" :xl="10"  :sm="24">
-                  <a-form-item label="标准名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input
-                      @change="event => event.target.value = event.target.value.trim()"
-                      :maxLength="50"
-                      v-decorator="['questionList['+index+'].standardName',validateInviteCode.standardName]"
-                      placeholder="请输入标准名称"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :xxl="8" :xl="4" :sm="24">
-                  <a-form-item>
-                    <a-button icon="plus" @click="addQuestionNew"></a-button>
-                    <a-button icon="minus" @click="removeQuestion(index)" style="margin-left: 8px;"></a-button>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </section>
-          </section>
-
           <!--邀请码begin-->
           <!--        国际研讨会出现-->
           <section v-if="meetingType === '3' ">