From 5a12223a569384ea8c471195b8f49acd79b244fb Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 18 Jul 2022 18:18:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91vip?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=B2=A1=E6=9C=89=E5=8D=87=E7=BA=A7=E4=B8=93?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaymentInfo/modules/PaymentInfoModal.vue  | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 9f1a867..7bb4969 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -168,6 +168,7 @@
           </a-col>
           <a-col :span="1"></a-col>
         </a-row>
+
         <template v-if="addFlag">
           <a-row>
             <a-col :span="12">
@@ -206,6 +207,7 @@
               <a-form-item label="缴费时长" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag
                   :disabled="checkFlag||detailFlag"
+                  ref="paymentTimeJdict"
                   @change="changgeType"
                   type="list"
                   v-decorator="['paymentTime',{ rules: validatorRules.paymentTime.rules, initialValue:paymentTime}]"
@@ -649,7 +651,7 @@ import {
   getCheckInfo,
   getByMemberTime,
   downNewestNotice,
-  judgeMemberNotApprove
+  judgeMemberNotApprove, ajaxGetDictItems
 } from '@/api/standardsAssociationApi'
 import JUpload from '@/components/standardsAssociation/JUpload'
 import PreViewImgModal from './PreViewImgModal'
@@ -1115,18 +1117,24 @@ export default {
       // 获取会员信息
       await this.loadMember()
       this.visible = true
-      // 获取会员 类型 1年 五年的
-      // let type = this.model.paymentTime
-      // 新增 设置 初始缴费金额
-      if(!this.model.id){
-         // 判断是否是 副理事单位
+      // 获取会员类型 vip会员不展示 升级专用
+      console.log(this.model.memberType,'this.model.memberTypethis.model.memberType')
+      if(this.model.memberType === 2){
         this.$nextTick( () => {
-          this.form.setFieldsValue({paymentAmount:commonMemberCost(this.memberType),'memberPaymentAmount': commonMemberCost(this.memberType)})
+          ajaxGetDictItems('payment_time', null).then((res) => {
+            if (res.success) {
+              this.dictOptions = res.result
+              let dictOptions = res.result
+              let index = dictOptions.findIndex(item => item.value === '3' )
+              dictOptions.splice(index,1)
+              this.$refs.paymentTimeJdict.setCurrentDictOptions(dictOptions)
+            }
+          })
+          // console.log(this.$refs.paymentTimeJdict.getCurrentDictOptions(),'this.$refs.paymentTimeJdict.getCurrentDictOptions()'
         })
-        // 计算缴费总金额
-        this.calculateAllAmount()
       }
 
+
       this.model.memberId = this.memberId
 
       this.startTime = this.model.effectiveDate ? this.model.effectiveDate : ''
@@ -1147,6 +1155,15 @@ export default {
         this.paymentTime = this.model.paymentTime
         this.paymentRecord = this.model.paymentRecord
       }
+      // 新增 设置 初始缴费金额
+      if(this.addFlag){
+        // 判断是否是 副理事单位
+        this.$nextTick( () => {
+          this.form.setFieldsValue({paymentAmount:commonMemberCost(this.memberType),'memberPaymentAmount': commonMemberCost(this.memberType)})
+        })
+        // 计算缴费总金额
+        this.calculateAllAmount()
+      }
       // 缴费单号
       // this.billNumber = this.model.billNumber
       this.$nextTick(() => {
@@ -1180,6 +1197,7 @@ export default {
       this.submitFlag = false
       this.initVal = 1
       this.confirmLoading = false
+      this.model = {}
     },
     handleOk() {
 
@@ -1216,7 +1234,7 @@ export default {
       let httpurl = ''
       let method = ''
       if (!this.model.id) {
-        httpurl += this.url.add
+        httpurl += this.url.combinationUrl
         method = 'post'
       } else {
         if (this.checkFlag) {
@@ -1325,6 +1343,7 @@ export default {
             this.invoiceInfoObj.bankAccount = memberInfo.bankAccount
             this.headerName = memberInfo.invoiceInfo
             this.memberType = memberInfo.memberNature
+            this.model = Object.assign({},memberInfo)
             switch (memberInfo.memberNature) {
               case 1:
                 this.memberNature = '副理事单位'
@@ -1332,7 +1351,6 @@ export default {
               case 2:
                 this.memberNature = '理事单位'
                 break
-
               case 3:
                 this.memberNature = '会员单位'
                 break