From e848ab6fa743e572d02b0a92aea0b92f7424a2c8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 28 Oct 2021 11:45:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?/=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=B4=B9=E7=94=A8=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            | 94 ++++++++++---------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index a9b8ab6..894895c 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -181,7 +181,11 @@
           <!--邀请码end-->
 
           <!--会议费用begin-->
-          <div class="item-title">会议费用</div>
+          <div>
+            <span class="item-title">会议费用</span>
+            <!--            工作组会议添加的需求变更-->
+            <span class="working-group-remind" v-if="isWorkGroupMeetType">不收费请填写0元</span>
+          </div>
           <a-row :gutter="24">
 
             <a-col :xxl="8" :xl="12" :sm="24">
@@ -329,9 +333,9 @@
 </template>
 
 <script>
-import {getUserInfo, getMeetInfoById} from '@api/incomeMeetingApi'
-import {isRepeat} from '@/utils/util'
-import {httpAction} from '@api/manage'
+import { getUserInfo, getMeetInfoById } from '@api/incomeMeetingApi'
+import { isRepeat } from '@/utils/util'
+import { httpAction } from '@api/manage'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
@@ -344,9 +348,9 @@ import pick from 'lodash.pick'
 import meetingValidate from '@views/incomePayments/meetManage/meetingValidate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import JImageUpload from '@comp/jero/JImageUpload'
-import {checkMeetingName} from '@/utils/validateOnly'
-import {addZero} from '@/utils/util'
-import {money} from '@/utils/validate'
+import { checkMeetingName } from '@/utils/validateOnly'
+import { addZero } from '@/utils/util'
+import { money } from '@/utils/validate'
 
 export default {
   name: 'AddOrDetailMeet',
@@ -369,26 +373,26 @@ export default {
       form: this.$form.createForm(this),
       model: {},
       labelCol: {
-        xxl: {span: 7},
-        xs: {span: 24},
-        sm: {span: 6}
+        xxl: { span: 7 },
+        xs: { span: 24 },
+        sm: { span: 6 }
       },
       wrapperCol: {
-        xxl: {span: 17},
-        xs: {span: 24},
-        sm: {span: 18}
+        xxl: { span: 17 },
+        xs: { span: 24 },
+        sm: { span: 18 }
       },
       remarksLabelCol: {
-        xxl: {span: 3},
-        xl: {span: 4},
-        xs: {span: 24},
-        sm: {span: 3}
+        xxl: { span: 3 },
+        xl: { span: 4 },
+        xs: { span: 24 },
+        sm: { span: 3 }
       },
       remarksWrapperCol: {
-        xxl: {span: 21},
-        xl: {span: 20},
-        xs: {span: 24},
-        sm: {span: 21}
+        xxl: { span: 21 },
+        xl: { span: 20 },
+        xs: { span: 24 },
+        sm: { span: 21 }
       },
       // 详细地址
       address: '',
@@ -396,39 +400,39 @@ export default {
       validateInviteCode: {
         invitationCode: {
           rules: [
-            {required: true, validator: this.validateCode},
+            { required: true, validator: this.validateCode }
           ],
           validateTrigger: ['blur']
         },
         meetingName: {
           rules: [
-            {required: true, validator: this.validaeMeetingName},
+            { required: true, validator: this.validaeMeetingName }
           ],
           validateTrigger: ['blur']
         },
         particularYear: {
           rules: [
-            {required: true, validator: this.validateYear},
+            { required: true, validator: this.validateYear }
           ],
           validateTrigger: ['blur', 'change'],
           initialValue: this.$store.getters.currentYear
         },
         meetingCosts: {
           rules: [
-            {required: true, validator: this.validateMeetingCosts},
+            { required: true, validator: this.validateMeetingCosts }
           ],
           validateTrigger: ['blur']
         },
         meetingCostsVip: {
           rules: [
-            {required: true, validator: this.validateMeetingCostsVip},
+            { required: true, validator: this.validateMeetingCostsVip }
           ],
           validateTrigger: ['blur']
-        },
+        }
       },
       url: {
         add: '/meeting/payMeeting/add',
-        edit: '/meeting/payMeeting/edit',
+        edit: '/meeting/payMeeting/edit'
       },
       // 召开时间
       newConvokeTime: '',
@@ -439,9 +443,9 @@ export default {
       // 收费二维码显示
       QRcodeBool: true,
       // 召开地点border颜色控制
-      hasError:false,
+      hasError: false,
       // 会议类型
-      meetingType: '',
+      meetingType: ''
     }
   },
   computed: {
@@ -460,13 +464,13 @@ export default {
       } else {
         return false
       }
-    },
+    }
   },
   mounted() {
     this.pcaData = new AreaPca()
     // 编辑获取会议信息 有id就是编辑走编辑
     if (this.$route.query.id) {
-      getMeetInfoById({id: this.$route.query.id}).then(res => {
+      getMeetInfoById({ id: this.$route.query.id }).then(res => {
         if (res.success) {
           this.edit(res.result)
         }
@@ -538,7 +542,7 @@ export default {
         }
         // 如果是工作组会议 赋值工作组
         if (this.meetingType === '1') {
-          this.form.setFieldsValue(pick(this.model, 'workingGroupId',))
+          this.form.setFieldsValue(pick(this.model, 'workingGroupId'))
         }
         // 如果是国际研讨会则赋值邀请码
         if (this.meetingType === '3') {
@@ -568,7 +572,7 @@ export default {
             httpurl = this.url.add
           }
           let placeName = values.convokeLocale
-          const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
+          const formData = Object.assign(this.model, values, { venue: this.getPcaText(placeName) })
           // 如果会议的费用未为0 不能上传缴费凭证
           if (values.meetingCosts === '0.00') {
             delete formData.paymentQrCode
@@ -611,8 +615,8 @@ export default {
     /*
     *
     * */
-    changeConvoke(val){
-      if(val){
+    changeConvoke(val) {
+      if (val) {
         this.hasError = false
       }
     },
@@ -648,10 +652,10 @@ export default {
     * 会议负责人
     * */
     selectPerson(val) {
-      getUserInfo({id: val}).then(res => {
+      getUserInfo({ id: val }).then(res => {
         if (res.success) {
           this.$nextTick(() => {
-            this.form.setFieldsValue({directorPhone: res.result.phone})
+            this.form.setFieldsValue({ directorPhone: res.result.phone })
           })
         }
       })
@@ -664,7 +668,7 @@ export default {
         this.$message.warning('最多添加5个酒店联系人')
         return
       }
-      const {form} = this
+      const { form } = this
       const obj = {
         hotelContacts: '',
         hotelContactsPhone: ''
@@ -687,7 +691,7 @@ export default {
       if (this.model.hotelContactsList.length === 1) {
         return
       }
-      const {form} = this
+      const { form } = this
       // // can use data-binding to get
       const hotelContactsList = form.getFieldValue('hotelContactsList')
       // 把循环的dom元素删除
@@ -796,7 +800,7 @@ export default {
       }
       const year = new Date().getFullYear()
       if (Number(value) < year) {
-        callback(`请选择${year}年或之后的年份`)
+        callback(`请选择${ year }年或之后的年份`)
       } else {
         callback()
       }
@@ -836,7 +840,7 @@ export default {
       } else {
         callback('请输入合法的金额数字，最多2位小数,10位正数')
       }
-    },
+    }
   }
 }
 </script>
@@ -870,6 +874,12 @@ export default {
   }
 }
 
+/*会议费用添加的提示语*/
+.working-group-remind {
+  color: red;
+  margin-left: 10px;
+}
+
 /* 新建会议 */
 
 .project-base-info-title {