From 653164f6593f41f86ed7cb10da47388c2ff73be5 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 1 Jul 2022 12:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E4=BC=81=E4=B8=9A=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=A1=8C=E7=A8=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeroListMixin.js                   |  1 -
 .../meetManage/OtherMeetingForm.vue           | 67 +++++++------------
 .../meetManage/SignUpInfoDetail.vue           | 28 ++++----
 .../WorkingGroupPaymentStatisticsDetail.vue   |  2 +-
 4 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 89f1c1d..e002911 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -9,7 +9,6 @@ import Vue from 'vue'
 import {ACCESS_TOKEN, TENANT_ID} from '@/store/mutation-types'
 import store from '@/store'
 import {Modal} from 'ant-design-vue'
-import {deleteByDepartId} from '@api/api'
 
 const defaultSorter = {
   column: 'createTime',
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 169c0c3..ed9afb1 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -1,31 +1,31 @@
 <template>
   <a-form :form="form">
-    <div class="item-title">行程信息</div>
-    <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="['checkInHotel']">
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </a-col>
+<!--    <div class="item-title">行程信息</div>-->
+<!--    <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="['checkInHotel']">-->
+<!--            <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">
-        <a-form-item label="抵达时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true" :disabled-date="disabledStartDate"
-                  date-format="YYYY-MM-DD"/>
-        </a-form-item>
-      </a-col>
+<!--      <a-col :xxl="8" :xl="12" :sm="24">-->
+<!--        <a-form-item label="抵达时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-date placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true" :disabled-date="disabledStartDate"-->
+<!--                  date-format="YYYY-MM-DD"/>-->
+<!--        </a-form-item>-->
+<!--      </a-col>-->
 
-      <a-col :xxl="8" :xl="12" :sm="24">
-        <a-form-item label="离开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择离开时间" :disabled-date="disabledEndDate" style="width: 100%;"
-                  v-decorator="['departureTime']" :trigger-change="true"
-                  date-format="YYYY-MM-DD"/>
-        </a-form-item>
-      </a-col>
-    </a-row>
+<!--      <a-col :xxl="8" :xl="12" :sm="24">-->
+<!--        <a-form-item label="离开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-date placeholder="请选择离开时间" :disabled-date="disabledEndDate" style="width: 100%;"-->
+<!--                  v-decorator="['departureTime']" :trigger-change="true"-->
+<!--                  date-format="YYYY-MM-DD"/>-->
+<!--        </a-form-item>-->
+<!--      </a-col>-->
+<!--    </a-row>-->
     <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
     <!--    会议费为0不显示 -->
     <template v-if="!meetingCostBool">
@@ -52,23 +52,6 @@
                                placeholder="请选择发票类型"></j-dict-select-tag>
           </a-form-item>
         </a-col>
-        <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
-        <!--        <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool  ">-->
-        <!--          <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--            <j-image-upload :disabled="isEditBool" v-decorator="['paymentRecord']" :return-id="true"></j-image-upload>-->
-        <!--          </a-form-item>-->
-        <!--        </a-col>-->
-        <!--缴费方式为线上的需要上传 -->
-        <!--       暂时注释  2021 10 14 author: fac  需求说是 不在报名和添加参会人的时候去上传 缴费凭证和订单后四位-->
-        <!--        <a-col :xxl="8" :xl="12" :sm="24" v-if="onlinePayModeBool">-->
-        <!--          <a-form-item label="订单号后四位" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--            <a-input placeholder="请输入订单号后四位"-->
-        <!--                     :maxLength='4'-->
-        <!--                     :disabled="isEditBool"-->
-        <!--                     @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"-->
-        <!--                     v-decorator="[ 'orderCode',validatorRules.orderCode]"></a-input>-->
-        <!--          </a-form-item>-->
-        <!--        </a-col>-->
       </a-row>
     </template>
     <!--    其他会议选择嘉宾和内部企业、缴费方式为打包也不显示-->
@@ -116,7 +99,6 @@
 </template>
 
 <script>
-import JDate from '@comp/jero/JDate'
 // import JImageUpload from '@comp/jero/JImageUpload'
 import SelectContacts from '@comp/company/SelectContacts'
 import pick from 'lodash.pick'
@@ -127,7 +109,6 @@ import {getContactsById} from '@api/api'
 export default {
   name: 'OtherMeetingForm',
   components: {
-    JDate,
     // JImageUpload,
     SelectContacts,
     JDictSelectTag
diff --git a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
index dcb9842..012e988 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
@@ -85,20 +85,20 @@
       <!-- 国际研讨会的参会人与内部企业-->
       <div v-if="meetingType === '3' && (model.identity === 2 || model.identity === 3)  ">
         <!--行程信息begin-->
-        <template>
-          <div class="item-title">行程信息</div>
-          <a-row :gutter="24" class="flex-col">
-            <a-col :xxl="8" :xl="12" :sm="24">
-              <label class="label">是否住酒店：</label><span>{{ model.checkInHotel_dictText }}</span>
-            </a-col>
-            <a-col :xxl="8" :xl="12" :sm="24" v-if="!!model.arrivalTime">
-              <label class="label">抵达时间：</label><span>{{ model.arrivalTime }}</span>
-            </a-col>
-            <a-col :xxl="8" :xl="12" :sm="24" v-if="!!model.departureTime ">
-              <label class="label">离开时间：</label><span>{{ model.departureTime }}</span>
-            </a-col>
-          </a-row>
-        </template>
+<!--        <template>-->
+<!--          <div class="item-title">行程信息</div>-->
+<!--          <a-row :gutter="24" class="flex-col">-->
+<!--            <a-col :xxl="8" :xl="12" :sm="24">-->
+<!--              <label class="label">是否住酒店：</label><span>{{ model.checkInHotel_dictText }}</span>-->
+<!--            </a-col>-->
+<!--            <a-col :xxl="8" :xl="12" :sm="24" v-if="!!model.arrivalTime">-->
+<!--              <label class="label">抵达时间：</label><span>{{ model.arrivalTime }}</span>-->
+<!--            </a-col>-->
+<!--            <a-col :xxl="8" :xl="12" :sm="24" v-if="!!model.departureTime ">-->
+<!--              <label class="label">离开时间：</label><span>{{ model.departureTime }}</span>-->
+<!--            </a-col>-->
+<!--          </a-row>-->
+<!--        </template>-->
         <!--行程信息end-->
 
         <!--缴费信息begin-->
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index 4fefd8f..ff87fe7 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -320,7 +320,7 @@ export default {
           sorter: true,
           dataIndex: 'confirmAmount',
           scopedSlots: { customRender: 'allMoney' }
-        },, {
+        }, {
           title: '来款用途',
           align: 'center',
           width: 160,