【bug】会议编辑为费用0 缴费二维码的的显示 样式修改

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -498,6 +498,12 @@ export default {
         this.meetingType = record.meetingType + ''
         // 编辑根据接口返回的会议类型获取不同的会议url
         this.url = this.createUrlByMeetingType(this.meetingType)
+        // 判断会议费用是否为 0 缴费二维码显示
+        if(this.model.meetingCosts === '0.00' ){
+          this.QRcodeBool = false
+        }else {
+          this.QRcodeBool = true
+        }
       } else {
         this.title = '新增会议'
         // 如果是标协会会议需要显示酒店联系人

src/views/incomePayments/meetManage/Attendance.vue

@@ -58,13 +58,13 @@
           <label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>演讲嘉宾邀请码：</label><span>{{ currentMeetingInfo.speakerInvitationCode }}</span>
+          <label style="min-width: 116px">演讲嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.speakerInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>特邀嘉宾邀请码：</label><span>{{ currentMeetingInfo.guestInvitationCode }}</span>
+          <label style="min-width: 116px">特邀嘉宾邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.guestInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>合作伙伴邀请码：</label><span>{{ currentMeetingInfo.cooperativeInvitationCode }}</span>
+          <label style="min-width: 116px">合作伙伴邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.cooperativeInvitationCode" :length="40"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row class="flex-col">

src/views/incomePayments/meetManage/SignUpInfoDetail.vue

@@ -5,12 +5,12 @@
       <!--个人信息begin-->
       <template>
         <div class="item-title">个人信息</div>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
-          <a-col :xxl="8" :xl="12" :sm="24">
+          <a-col :xxl="24" :xl="24" :sm="24">
             <label class="label">参会企业：</label><span>{{ model.companyName }}</span>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :xxl="8" :xl="12" :sm="24">
             <label class="label">姓名：</label><span>{{ model.companyContactName }}</span>
           </a-col>
@@ -32,7 +32,7 @@
         <!--行程信息begin-->
         <template>
           <div class="item-title">行程信息</div>
-          <a-row :gutter="24">
+          <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>
@@ -51,7 +51,7 @@
         <!--缴费信息begin-->
         <template v-if="model.identity === 2">
           <div class="item-title">缴费信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">缴费方式：</label><span>{{ model.payMode_dictText }}</span>
             </a-col>
@@ -69,7 +69,7 @@
         <!--邮寄信息begin-->
         <template v-if="model.identity === 2 && model.needInvoice !== 0 ">
           <div class="item-title">邮寄信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">邮寄联系人：</label><span>{{ model.postContactName }}</span>
             </a-col>
@@ -88,7 +88,7 @@
         <!--行程信息begin-->
         <template>
           <div class="item-title">行程信息</div>
-          <a-row :gutter="24">
+          <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>
@@ -106,7 +106,7 @@
 <!--       内部企业显示 -->
         <template v-if="model.identity !== 3  ">
           <div class="item-title">缴费信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">缴费方式：</label><span>{{ model.payMode_dictText }}</span>
             </a-col>
@@ -125,7 +125,7 @@
         <!--        参会人不需要发票不显示 -->
         <template v-if="model.needInvoice !== 0">
           <div class="item-title">邮寄信息</div>
-          <a-row :gutter="24">
+          <a-row :gutter="24" class="flex-col">
             <a-col :xxl="8" :xl="12" :sm="24">
               <label class="label">邮寄联系人：</label><span>{{ model.postContactName }}</span>
             </a-col>
@@ -351,6 +351,7 @@ export default {
   .ant-col {
     label {
       color: #999;
+      min-width: 45px;
     }
 
     span {

src/views/incomePayments/meetManage/modules/SeminarVipForm.vue

@@ -199,7 +199,7 @@
 
     </a-row>
     <!--特邀嘉宾没有备注-->
-    <a-row v-if="guestType!== 3">
+    <a-row v-if="guestType!== 3" :gutter="24" style="transform: translateX(-4px)">
       <a-col>
         <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
           <a-textarea

src/views/signUp/SignUpEntrance.vue

@@ -59,7 +59,7 @@
               <span>{{ currentMeetingInfo.registerDeadline }}</span>
             </a-col>
             <a-col :span="12" style="display: flex">
-              <label>附件：</label>
+              <label>会议通知：</label>
               <preview-file :file-id="currentMeetingInfo.meetingFiles"
                             v-if="currentMeetingInfo.meetingFiles"></preview-file>
             </a-col>
@@ -177,7 +177,7 @@ export default {
           if (this.currentMeetingInfo.meetingCostsVip) {
             this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
           } else {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+            this.meetingMoney = ` ${this.currentMeetingInfo.meetingCosts}/人`
           }
           // 初始化召开时间
           if (this.currentMeetingInfo.startTime) {

src/views/signUp/SignUpPage.vue

@@ -359,13 +359,13 @@ export default {
         if (res.success) {
           this.currentMeetingInfo = res.result
           this.meetingType = this.currentMeetingInfo.meetingType
-          // 初始化会议费用  这里的判断有问题 应该根据单位是否是标协会员单位 显示不同的会议费用
+          // 初始化会议费用
           if (this.currentMeetingInfo.meetingCostsVip) {
             this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)  标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)`
             // 费用合计
             this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           } else {
-            this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)`
+            this.meetingMoney = `${this.currentMeetingInfo.meetingCosts}/人`
             // 费用合计
             this.meetingCostSum = this.currentMeetingInfo.meetingCosts
           }
@@ -520,6 +520,24 @@ export default {
       if (e.target.value !== 1) {
         this.guestType = null
       }
+      // 当前会议是国际研讨会 并且选择身份是内部企业的会议费用为0
+      if(e.target.value === 3 && this.currentMeetingInfo.meetingType === '3' ){
+        this.meetingCostSum = '0.00'
+      }else {
+        this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
+      }
+      // 当前会议不是国际研讨会议 身份选择嘉宾和 内部企业的会议费用为0
+      if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
+        this.meetingCostSum = '0.00'
+      }else {
+        // 会议是标协会议的话 需要判断企业是否是标准协会
+        if(this.currentMeetingInfo.meetingType === '2' && this.isStandardBool){
+          this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+        }else {
+          this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
+        }
+
+      }
     },
     /*
     * 选择嘉宾类型
@@ -601,32 +619,39 @@ export default {
     * 下一步
     * */
     nextSetp() {
-      // 获取邀请码
+      this.form.validateFields(['code'],(err) => {
-      let code = this.form.getFieldValue('code')
+        if(!err){
-      switch (code) {
+          // 获取邀请码
-        // 合作伙伴
+          let code = this.form.getFieldValue('code')
-        case this.currentMeetingInfo.cooperativeInvitationCode:
+          switch (code) {
-          this.identifyType = 1
+            // 合作伙伴
-          this.guestType = 4
+            case this.currentMeetingInfo.cooperativeInvitationCode:
-          break
+              this.identifyType = 1
-        // 演讲嘉宾
+              this.guestType = 4
-        case this.currentMeetingInfo.speakerInvitationCode:
+              break
-          this.identifyType = 1
+            // 演讲嘉宾
-          this.guestType = 2
+            case this.currentMeetingInfo.speakerInvitationCode:
-          break
+              this.identifyType = 1
-        // 特邀嘉宾
+              this.guestType = 2
-        case this.currentMeetingInfo.guestInvitationCode:
+              break
-          this.identifyType = 1
+            // 特邀嘉宾
-          this.guestType = 3
+            case this.currentMeetingInfo.guestInvitationCode:
-          break
+              this.identifyType = 1
-        // vip
+              this.guestType = 3
-        case this.currentMeetingInfo.vipInvitationCode:
+              break
-          this.identifyType = 1
+            // vip
-          this.guestType = 1
+            case this.currentMeetingInfo.vipInvitationCode:
-          break
+              this.identifyType = 1
-        default :
+              this.guestType = 1
-          this.guestType = null
+              break
-      }
+            default :
+              this.guestType = null
+          }
+        }
+      })
+
+
+
     },
     /*
     * 校验邀请码是否正确 给出提示

src/views/system/DepartList.vue

@@ -595,7 +595,7 @@ export default {
                 that.onClearSelected()
               }
             } else {
-              that.$message.warning('删除失败!')
+              that.$message.warning(resp.message)
             }
           })
         }