【update】-WASIC

src/api/incomeMeetingApi.js

@@ -29,6 +29,9 @@ const editGenerateCodeList = (params) => postAction('/meeting/randomCode/edit',
 // 标协会议-问题征集详情-查询标准号下拉框数据
 const getStandardNumberList = (params) => getAction('/meeting/standardsMeeting/getStandardNumberList', params)
 
+// 国际研讨会-WASIC-通过会议ID获取关联主题的信息
+const getLinkTopics = (params) => getAction('/meeting/internalMeeting/getLinkTopics', params)
+
 
 export {
   getUserInfo,
@@ -42,5 +45,6 @@ export {
   generateCode,
   addGenerateCodeList,
   editGenerateCodeList,
-  getStandardNumberList
+  getStandardNumberList,
+  getLinkTopics
 }

src/enums/commonEnums.js

@@ -22,3 +22,14 @@ export const InvoiceTypeEnums = {
   plain: { name: '增值税普通发票', index: 1 },
   special: { name: '增值税专用发票', index: 2 }
 }
+// 国际研讨会关联课题
+//汽车网络安全与数据安全标准合规专题,
+// 智能网汽车标准化领航及标准路线图专题,
+// 汽车地毯专题,
+// 动力电池安全专题,
+// 弱势道路交通参与者（VRU）保护专题,
+// 免费专题
+export const LinkTopicsEnums = {
+  free: { name: '免费专题', index: 6 }
+}
+

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -757,6 +757,7 @@ export default {
         }
         this.model.isAddQuestion = this.model.isAddQuestion || 0 // 处理历史数据的问题
         // 是否WASIC--处理历史数据的问题
+        this.model.isWasic = this.model.isWasic || 0
         this.isWasic = this.model.isWasic || 0
       } else {
         this.title = '新增会议'
@@ -871,6 +872,10 @@ export default {
           }
           // 添加编辑会议需要增加会议类型
           formData.meetingType = this.meetingType
+          // 国际研讨会 对isWasic做处理
+          if(formData.meetingType === '3') {
+            formData.isWasic = Number(formData.isWasic)
+          }
           // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id
           if (this.isWorkGroupMeetType) {
             formData.meetingType = '1'
@@ -1186,7 +1191,7 @@ export default {
     // 是否WASIC 会议
     isWasicChange(e) {
       console.log(e)
-      this.isWasic = e
+      this.isWasic = Number(e)
     },
     /*
     * 根据会议类型返回不同的会议新增与编辑接口

src/views/incomePayments/meetManage/Attendance.vue

@@ -17,12 +17,12 @@
           <label>标协会议类型：</label><span>{{ tbMeetingType }}</span>
         </a-col>
         <!--国际研讨会的判断-是否WASIC-->
-        <template v-show="currentMeetingInfo.meetingType === '3' ">
+        <template v-if="currentMeetingInfo.meetingType === '3' ">
           <a-col :xxl="8" :xl="12" :sm="24" >
             <label>是否WASIC：</label><span>{{ currentMeetingInfo.isWasic_dictText || '否' }}</span>
           </a-col>
           <a-col :xxl="8" :xl="12" :sm="24" v-if="currentMeetingInfo.isWasic">
-            <label>关联课题：</label><span>{{ currentMeetingInfo.linkTopics_dictTixt }}</span>
+            <label>关联课题：</label><span><j-ellipsis :value="currentMeetingInfo.linkTopics_dictText" :length="35"></j-ellipsis></span>
           </a-col>
         </template>
 
@@ -57,14 +57,14 @@
             <label>会议费用（3个及以上）：</label><span>{{ currentMeetingInfo.meetingCostsThreeTopic }} 元/人</span>
           </a-col>
         </template>
-        <temaplte v-else>
+        <template v-else>
           <a-col :xxl="8" :xl="12" :sm="24" >
             <label>会议费用：</label><span>{{ currentMeetingInfo.meetingCosts }} 元/人</span>
           </a-col>
           <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
             <label>会议费用(标协会员)：</label><span>{{ currentMeetingInfo.meetingCostsVip }} 元/人</span>
           </a-col>
-        </temaplte>
+        </template>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>预计参加人数：</label><span>{{ currentMeetingInfo.estimatedNumber }}</span>
         </a-col>

src/views/incomePayments/meetManage/OtherMeetingForm.vue

@@ -401,6 +401,13 @@ export default {
     checkTaxMoney(rules, value, callback) {
       this.checkMoneyTemplate(rules, value, callback, '税额')
     },
+    changeReceivableAmountParent(params) {
+      // 表单赋值
+      this.form.setFieldsValue({
+        'amountReceivable': params.target.value
+      })
+      this.changeReceivableAmount(params)
+    },
     handleOk() {
       this.form.validateFields((err, values) => {
         if (!err) {

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -43,7 +43,7 @@
                          v-decorator="['phone',validatorRules.phone]"></a-input>
               </a-form-item>
             </a-col>
-            <!-- 国际研讨会 WASIC 增加课题名称的选择-->
+            <!-- 国际研讨会 WASIC 增加课题名称的选择--已经到账的信息不能修改-->
             <a-col :xxl="8" :xl="12" :sm="24" v-if="currentMeetingInfo.isWasic">
               <a-form-item label="课题名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-multi-select-tag
@@ -52,8 +52,11 @@
                   style="width: 100%"
                   dict-code="linkTopics"
                   placeholder="请选择课题名称"
+                  :options="linkTopicsOptionArr"
                   type="checkbox"
                   class="meeting-form-multi-select"
+                  @change="changeChoiceTopic"
+                  :disabled="model.inAccount === 1"
                 >
                 </j-multi-select-tag>
               </a-form-item>
@@ -144,12 +147,13 @@ import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipF
 import SeminarPartnerForm from '@views/incomePayments/meetManage/modules/SeminarPartnerForm'
 import AddMeetingCompany from '@comp/company/AddMeetingCompany'
 import {getContactsById} from '@api/api'
-import {getSingUpUserInfo, validateStandard, getMeetInfoById} from '@api/incomeMeetingApi'
+import {getSingUpUserInfo, validateStandard, getMeetInfoById, getLinkTopics} from '@api/incomeMeetingApi'
 import { judgeInternalEnterprise } from '../../../api/incomePaymentsApi'
 import {httpAction} from '@api/manage'
 import pick from 'lodash.pick'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import { queryCompanyInfoById } from '../../../api/api'
+import { LinkTopicsEnums } from "../../../enums/commonEnums";
 
 export default {
   name: 'SignUpInfoEdit',
@@ -265,7 +269,9 @@ export default {
       },
       title:'添加参会人',
       // 当前参会企业是否是内部企业
-      isInternalEnterprise: false
+      isInternalEnterprise: false,
+      // 可选课题名称的数组
+      linkTopicsOptionArr: []
     }
   },
   created() {
@@ -310,6 +316,14 @@ export default {
     },
   },
   methods: {
+    // 获取国际研讨会-能选择课题的数据字典数据
+    getLinkTopicsOptionArr(meetingId) {
+      getLinkTopics({id: meetingId}).then(res =>{
+        if(res.success) {
+          this.linkTopicsOptionArr = res.result || []
+        }
+      })
+    },
     // 通过企业的id获取企业管理中的基本信息，用于发票回显
     queryCompanyInfoById(id) {
       return new Promise(resolve => {
@@ -488,6 +502,21 @@ export default {
     handleCancel() {
       this.$router.go(-1)
     },
+    // 国际研讨会-WASIC-改变选择的主题值
+    changeChoiceTopic(e) {
+      console.log('e------', e)
+      // let choiceTopicArr = (e || '').split(',')
+      // choiceTopicArr = choiceTopicArr.filter(item => item && item !== (LinkTopicsEnums.free.index + ''))
+      // let meetingCostSum = 0
+      // console.log('choiceTopicArr------', choiceTopicArr)
+      // if(choiceTopicArr.length > 2) {
+      //   meetingCostSum = this.currentMeetingInfo.meetingCostsThreeTopic
+      // } else {
+      //   meetingCostSum = this.currentMeetingInfo.meetingCostsTwoTopic
+      // }
+      // 改变组件内的待收金额
+      // this.$refs.formother && this.$refs.formother.changeReceivableAmountParent({target: {value: meetingCostSum}})
+    },
     /*
     * 改变身份
     * */
@@ -594,9 +623,13 @@ export default {
      * */
     queryMeetingInfo(meetingId){
       this.currentMeetingInfo = {}
-      getMeetInfoById({id:meetingId}).then(res => {
+      getMeetInfoById({id: meetingId}).then(res => {
         if(res.success){
           this.currentMeetingInfo = res.result
+          // 国际研讨会 且为WASIC 会议
+          if (this.currentMeetingInfo.meetingType === '3' && this.currentMeetingInfo.isWasic){
+            this.getLinkTopicsOptionArr(meetingId)
+          }
         }
       })
     }

src/views/projectManagement/InternationalSeminar.vue

@@ -55,6 +55,11 @@
               </j-date>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否WASIC">
+              <j-dict-select-tag placeholder="请选择是否WASIC" dict-code="yn" v-model="queryParam.isWasic"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search" v-has="'internalMeeting:search'">查询</a-button>