From ee09e03fb1c5a9ce4165a2e2acd1aa9c6ec33fbf Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 19 Jul 2022 15:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8F=9C=E5=8D=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.config.js                   | 110 ++++++++++--------
 .../PaymentInfo/CertificateInfo.vue           |   2 +-
 .../PaymentInfo/modules/PaymentInfoModal.vue  |   2 -
 .../feehandle/FeeHandle.vue                   |  60 ++++++++++
 4 files changed, 123 insertions(+), 51 deletions(-)
 create mode 100644 src/views/standardsAssociation/feehandle/FeeHandle.vue

diff --git a/src/config/router.config.js b/src/config/router.config.js
index 52df426..8569359 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -233,25 +233,39 @@ export const routerData = [
           keepAlive: false,
           internalOrExternal: false,
           componentName: 'PaymentInfo',
-          title: '缴费信息'
+          title: '综合业务'
         },
         name: 'standardsAssociation-PaymentInfo',
         path: '/standardsAssociation/PaymentInfo',
         route: '1',
         children: [
           {
-            component: 'standardsAssociation/PaymentInfo/MemberInfo',
+            component: 'standardsAssociation/feehandle/FeeHandle',
             id: 'standardsMemberInfo4-4-1',
             meta: {
               keepAlive: false,
               internalOrExternal: false,
-              componentName: 'MemberInfo',
-              title: '会员缴费'
+              componentName: 'FeeHandle',
+              title: '费用办理'
             },
-            name: 'standardsAssociation-PaymentInfo-MemberInfo',
-            path: '/standardsAssociation/PaymentInfo/MemberInfo',
+            name: 'standardsAssociation/feehandle/FeeHandle',
+            path: '/standardsAssociation/feehandle/FeeHandle',
             route: '1'
-          }, {
+          },
+          {
+            component: 'standardsAssociation/CertificateManagement',
+            id: 'standardsMemberInfo4-4-1',
+            meta: {
+              keepAlive: false,
+              internalOrExternal: false,
+              componentName: 'CertificateManagement',
+              title: '证书服务'
+            },
+            name: 'standardsAssociation/CertificateManagement',
+            path: '/standardsAssociation/CertificateManagement',
+            route: '1'
+          },
+          {
             component: 'standardsAssociation/PaymentInfo/InvoiceInfo',
             id: 'standardsInvoiceInfo4-4-3',
             meta: {
@@ -266,47 +280,47 @@ export const routerData = [
           }
         ]
       },
-      {
-        component: 'layouts/RouteView',
-        id: 'standardsCertificateManagement4-3',
-        meta: {
-          keepAlive: false,
-          internalOrExternal: false,
-          componentName: 'CertificateManagement',
-          title: '证书缴费'
-        },
-        name: 'standardsAssociation-CertificateManagement',
-        path: '/standardsAssociation/CertificateManagement',
-        route: '1',
-        children: [
-          {
-            component: 'standardsAssociation/CertificateManagement',
-            id: 'standardsCertificateManagement4-3-1',
-            meta: {
-              keepAlive: false,
-              internalOrExternal: false,
-              componentName: 'CertificateManagement',
-              title: '证书申请'
-            },
-            name: 'standardsAssociation-CertificateManagement',
-            path: '/standardsAssociation/CertificateManagement',
-            route: '1'
-          },
-          {
-            component: 'standardsAssociation/PaymentInfo/CertificateInfo',
-            id: 'standardsCertificateInfo4-3-2',
-            meta: {
-              keepAlive: false,
-              internalOrExternal: false,
-              componentName: 'CertificateInfo',
-              title: '项目查询'
-            },
-            name: 'standardsAssociation-PaymentInfo-CertificateInfo',
-            path: '/standardsAssociation/PaymentInfo/CertificateInfo',
-            route: '1'
-          }
-        ]
-      },
+      // {
+      //   component: 'layouts/RouteView',
+      //   id: 'standardsCertificateManagement4-3',
+      //   meta: {
+      //     keepAlive: false,
+      //     internalOrExternal: false,
+      //     componentName: 'CertificateManagement',
+      //     title: '证书缴费'
+      //   },
+      //   name: 'standardsAssociation-CertificateManagement',
+      //   path: '/standardsAssociation/CertificateManagement',
+      //   route: '1',
+      //   children: [
+      //     {
+      //       component: 'standardsAssociation/CertificateManagement',
+      //       id: 'standardsCertificateManagement4-3-1',
+      //       meta: {
+      //         keepAlive: false,
+      //         internalOrExternal: false,
+      //         componentName: 'CertificateManagement',
+      //         title: '证书申请'
+      //       },
+      //       name: 'standardsAssociation-CertificateManagement',
+      //       path: '/standardsAssociation/CertificateManagement',
+      //       route: '1'
+      //     },
+      //     {
+      //       component: 'standardsAssociation/PaymentInfo/CertificateInfo',
+      //       id: 'standardsCertificateInfo4-3-2',
+      //       meta: {
+      //         keepAlive: false,
+      //         internalOrExternal: false,
+      //         componentName: 'CertificateInfo',
+      //         title: '项目查询'
+      //       },
+      //       name: 'standardsAssociation-PaymentInfo-CertificateInfo',
+      //       path: '/standardsAssociation/PaymentInfo/CertificateInfo',
+      //       route: '1'
+      //     }
+      //   ]
+      // },
 
       {
         component: 'standardsAssociation/vinCertificate/Authorization',
diff --git a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
index c2c2a65..0a88485 100644
--- a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
@@ -52,7 +52,7 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
         <div class="notice-msg">
-          附加证书需求，请转至“证书管理”工作区提交申请。本页面仅提供数据查询。
+          附加证书需求，请转至“证书服务”工作区提交申请。本页面仅提供数据查询。
         </div>
         <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       </div>
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 7bb4969..65c00d0 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -1118,12 +1118,10 @@ export default {
       await this.loadMember()
       this.visible = true
       // 获取会员类型 vip会员不展示 升级专用
-      console.log(this.model.memberType,'this.model.memberTypethis.model.memberType')
       if(this.model.memberType === 2){
         this.$nextTick( () => {
           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)
diff --git a/src/views/standardsAssociation/feehandle/FeeHandle.vue b/src/views/standardsAssociation/feehandle/FeeHandle.vue
new file mode 100644
index 0000000..cb2cb15
--- /dev/null
+++ b/src/views/standardsAssociation/feehandle/FeeHandle.vue
@@ -0,0 +1,60 @@
+<template>
+  <a-card :bordered="false">
+    <a-radio-group v-model="menuValue" @change="changeMenu">
+      <a-radio :style="radioStyle" :value="1">
+        会员缴费
+      </a-radio>
+      <a-radio :style="radioStyle" :value="2">
+        证书缴费
+      </a-radio>
+    </a-radio-group>
+    <!--    会员缴费 begin -->
+    <member-info v-if="menuValue === 1"></member-info>
+    <!--    会员缴费 end -->
+
+    <!--   证书缴费 begin -->
+    <certificate-info v-if="menuValue === 2"></certificate-info>
+      <!--   证书缴费 end -->
+
+  </a-card>
+</template>
+
+<script>
+// import PaymentInfoList from '@views/member/paymentInfo/PaymentInfoList'
+import CertificateInfo from '@views/standardsAssociation/PaymentInfo/CertificateInfo'
+import MemberInfo from '@views/standardsAssociation/PaymentInfo/MemberInfo'
+
+export default {
+  name: 'FeeHandle',
+  components: {
+    MemberInfo,
+    CertificateInfo
+  },
+  data() {
+    return {
+      menuValue: 1,
+      radioStyle: {
+        display: 'block',
+        height: '30px',
+        lineHeight: '30px'
+      }
+    }
+  },
+  methods: {
+    /**
+     * 更换菜单
+     * */
+    changeMenu(e) {
+      console.log(e)
+      this.menuValue = e.target.value
+    }
+  },
+  beforeDestroy() {
+    this.menuValue = 1
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>