[fix 86931] 去掉不必要的字段

src/components/ProjectDetailModal.vue

@@ -7,7 +7,7 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <!-- 基本信息begin-->
-    <section class="base-info" v-if="projectType !== ProjectTypeEnums.DRAFT_PRO.value">
+    <section class="base-info" v-if="!isDraftGroup">
       <h3 class="title">基本信息</h3>
       <a-row :gutter="24">
         <a-col :span="12" class="detail-item">
@@ -292,7 +292,7 @@
     </section>
     <!--    企业联系人信息end-->
     <!--到账信息begin-->
-    <section class="payment-info" v-if="projectType !== ProjectTypeEnums.DRAFT_PRO.value">
+    <section class="payment-info" v-if="!isDraftGroup && !isSafetyCenterMeeting">
       <h3 class="title">到账信息</h3>
       <div class="payment-info-box">
         <section class="payment-info-title">到账信息</section>
@@ -306,7 +306,7 @@
     </section>
     <!--到账信息end-->
     <!--开票邮寄信息begin-->
-    <section class="logistics-info" v-if="projectType !== ProjectTypeEnums.DRAFT_PRO.value">
+    <section class="logistics-info" v-if="!isDraftGroup && !isSafetyCenterMeeting">
       <h3 class="title">开票邮寄信息</h3>
       <div class="wrap-table">
         <a-table
@@ -341,7 +341,7 @@
 import { queryCommonProjectById, getStanderMemberLastProofInfo, getCertificateLastProofInfo } from '@api/incomePaymentsApi'
 import JEllipsis from '@comp/jero/JEllipsis'
 import PreviewFile from './jero/PreviewFile'
-import { ProjectTypeEnums } from '@/enums/commonEnums'
+import {MeetingTypeEnums, ProjectTypeEnums} from '@/enums/commonEnums'
 import Vue from 'vue'
 import {ACCESS_TOKEN} from '@/store/mutation-types'
 import PreviewFileModal from '@comp/PreviewFileModal'
@@ -414,6 +414,11 @@ export default {
     projectType:{
       type: Number,
       required: false
+    },
+    // 会议类型
+    meetingType: {
+      type: String,
+      required: false
     }
   },
   data() {
@@ -441,6 +446,15 @@ export default {
     }
   },
   computed: {
+    // 是否起草组项目
+    isDraftGroup () {
+      return this.projectType === ProjectTypeEnums.DRAFT_PRO.value
+    },
+    // 是否功能安全中心会议
+    isSafetyCenterMeeting () {
+      console.log(this.meetingType)
+      return this.meetingType + '' === MeetingTypeEnums.safetyCenter.value
+    },
     // 是否是第三方代付
     hasOtherCompany() {
       // 去掉未审核 去判断的企业是否是标协会企业

src/views/incomePayments/meetManage/Attendance.vue

@@ -208,7 +208,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="!isSafetyCenter">
               <a-form-item label="来款年份">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.particularYear"></j-year-date>
               </a-form-item>
@@ -227,29 +227,30 @@
                                    dictCode="guest_type"/>
               </a-form-item>
             </a-col>
-
+            <template v-if="!isSafetyCenter">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否打包">
+                <a-form-item label="是否打包">
-                <j-dict-select-tag v-model="queryParam.pack" placeholder="请选择是否打包" @input="selectIdentity"
+                  <j-dict-select-tag v-model="queryParam.pack" placeholder="请选择是否打包" @input="selectIdentity"
-                                   dictCode="yn"/>
+                                     dictCode="yn"/>
-              </a-form-item>
+                </a-form-item>
-            </a-col>
+              </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
-              <a-form-item label="缴费方式">
+                <a-form-item label="缴费方式">
-                <j-dict-select-tag
+                  <j-dict-select-tag
-                  v-model="queryParam.payMode"
+                    v-model="queryParam.payMode"
-                  placeholder="请选择缴费方式"
+                    placeholder="请选择缴费方式"
-                  dictCode="meeting_pay_type"/>
+                    dictCode="meeting_pay_type"/>
-              </a-form-item>
+                </a-form-item>
-            </a-col>
+              </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero">
-              <a-form-item label="发票项目">
+                <a-form-item label="发票项目">
-                <j-dict-select-tag
+                  <j-dict-select-tag
-                  v-model="queryParam.invoiceProject"
+                    v-model="queryParam.invoiceProject"
-                  placeholder="请选择发票项目"
+                    placeholder="请选择发票项目"
-                  dictCode="invoice_project"/>
+                    dictCode="invoice_project"/>
-              </a-form-item>
+                </a-form-item>
-            </a-col>
+              </a-col>
+            </template>
             <!-- 国际研讨会 且为 WASIC时显示 -->
             <a-col :xl="6" :lg="7" :md="8" :sm="24" class="flex-width-zero" v-if="currentMeetingInfo.meetingType === '3' && currentMeetingInfo.isWasic">
               <a-form-item label="会议名称">
@@ -459,11 +460,11 @@
       <!--设置对接人-->
       <batch-set-docker-modal ref="batchSetDockerModal" @ok="modalFormOk"></batch-set-docker-modal>
       <!--详情-->
-      <project-detail-modal ref="projectDetailModal"></project-detail-modal>
+      <project-detail-modal ref="projectDetailModal" :meeting-type="currentMeetingInfo.meetingType"></project-detail-modal>
       <!--审核-->
       <audit-modal ref="auditModal" @ok="modalFormOk"></audit-modal>
       <!--设置资料状态--即嘉宾是否可以在企业端上传资料-->
-      <set-guess-upload-flag-modal ref="setGuessUploadFlagModal" :meeting-id="meetingId" :meeting-type="meetingTypeValue" @ok="modalFormOk"></set-guess-upload-flag-modal>
+      <set-guess-upload-flag-modal ref="setGuessUploadFlagModal" :meeting-id="meetingId" @ok="modalFormOk"></set-guess-upload-flag-modal>
     </a-card>
   </div>
 </template>
@@ -623,6 +624,56 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
+      // 功能安全中心表格
+      safetyCenterColumns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '参会单位',
+          align: 'center',
+          dataIndex: 'companyName',
+          scopedSlots: { customRender: 'htmlSlot' },
+        },
+        {
+          title: '参会人员',
+          align: 'center',
+          dataIndex: 'companyContactName',
+          width: 160,
+          scopedSlots: { customRender: 'person' }
+        },
+        {
+          title: '是否签到',
+          align: 'center',
+          dataIndex: 'checkIn_dictText',
+          width: 80
+        },
+        {
+          title: '身份',
+          align: 'center',
+          dataIndex: 'identity_dictText',
+          width: 80
+        },
+        {
+          title: '对接人',
+          align: 'center',
+          dataIndex: 'dockName'
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 300,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
       // 海外会议表格
       overseasMeetingColumns: [
         {
@@ -903,6 +954,10 @@ export default {
     if (this.isOverseasMeeting) {
       this.columns = this.overseasMeetingColumns
     }
+    // 功能安全中心表格
+    if (this.isSafetyCenter) {
+      this.columns = this.safetyCenterColumns
+    }
     // 为不同会议的参会情况去设置不同的权限编码
     this.setCodeByMeetingType(this.$route.query.meetingType)
     // 获取会议详情
@@ -968,6 +1023,10 @@ export default {
     this.signInQRCode = await this.generateQRCode(this.signInUrl)
   },
   computed: {
+    // 是否功能安全中心
+    isSafetyCenter() {
+      return this.$route.query.meetingType === MeetingTypeEnums.safetyCenter.value
+    },
     // 是否海外会议
     isOverseasMeeting () {
       return this.$route.query.meetingType === MeetingTypeEnums.overseas.value

src/views/incomePayments/meetManage/SignUpInfoDetail.vue

@@ -30,7 +30,8 @@
       <!-- 不是国际研讨会的 -->
       <div v-if="meetingType !== '3' ">
         <!--行程信息begin-->
-        <template>
+        <!-- 如果所有字段都没有值就不显示 -->
+        <template v-if="!!model.checkInHotel_dictText || !!model.arrivalTime || !!model.departureTime">
           <div class="item-title">行程信息</div>
           <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
@@ -270,6 +271,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import {getSingUpUserInfo} from '@api/incomeMeetingApi'
 import JImageUpload from '@comp/jero/JImageUpload'
 import PreviewFile from '@comp/jero/PreviewFile'
+import {MeetingTypeEnums} from '@/enums/commonEnums'
 
 
 export default {
@@ -293,6 +295,7 @@ export default {
   },
   data() {
     return {
+      MeetingTypeEnums,
       model: {},     // 会议信息
       meetingType: '' // 会议类型
     }