【update】标协会员注册页面迁移至来款企业端；修改会员缴费、证书缴费反馈的问题

2022-01-24 23:14:12 +08:00
parent cc7ceb4248
commit 96ad46dbcc
14 changed files with 1961 additions and 28 deletions
@@ -251,6 +251,8 @@ export default {
            method = 'put'
          }
          const formData = Object.assign(this.model, values)
+          // 用户昵称 默认等于单位全称
+          formData.realname = formData.companyName
          let encrypt = new JSEncrypt()
          encrypt.setPublicKey(that.encryptedString)
          formData.standardPhone = encrypt.encrypt(values.standardPhone)
@@ -51,6 +51,9 @@

      <!-- 操作按钮区域 -->
      <div class="table-operator">
+        <div class="notice-msg">
+          附加证书需求，请转至“证书管理”工作区提交申请。本页面仅提供数据查询。
+        </div>
        <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
      </div>

@@ -303,4 +306,8 @@ export default {

 <style scoped lang="less">
@import '~@assets/less/common.less';
+.notice-msg{
+  color: red;
+  padding-bottom: 5px;
+}
 </style>
@@ -235,11 +235,11 @@ export default {
              align: 'center',
              dataIndex: 'paymentAmount'
            },
-            {
-              title: '网员服务费',
-              align: 'center',
-              dataIndex: 'serviceCharge'
-            },
+            // {
+            //   title: '网员服务费',
+            //   align: 'center',
+            //   dataIndex: 'serviceCharge'
+            // },
            // {
            //   title:'证书个数',
            //   align:"center",
@@ -11,7 +11,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form" style="margin-left: 10px">
        <a-divider orientation="left">
-          缴费信息<font color="red">（缴费时长满5年才可申请证书）</font>
+          缴费信息<font color="red">（缴费时长5年可绑定两张证书）</font>
          <span
            v-if="isMember === 'member'"
            class="charge-notice"
@@ -60,7 +60,7 @@
            </a-form-item>
          </a-col>
        </a-row>
-        <a-row>
+        <a-row class="payment-table">
          <a-col :span="1"></a-col>
          <a-col :span="22">
            <table class="table" border="1">
@@ -82,6 +82,7 @@
                      :trigger-change="true"
                      dictCode="payment_time"
                      placeholder="请选择缴费时长"
+                      :get-popup-container="(node) => node.parentNode || document.body"
                      style="width: 140px" />
                  </a-form-item>
                </td>
@@ -100,7 +101,7 @@
                  </a-form-item>
                </td>
              </tr>
-              <tr>
+<!--              <tr>
                <td>网员服务费</td>
                <td>
                  <span>1年</span>
@@ -118,7 +119,7 @@
                      style="width: 180px" />
                  </a-form-item>
                </td>
-              </tr>
+              </tr>-->
            </table>
          </a-col>
          <a-col :span="1"></a-col>
@@ -329,8 +330,8 @@

        <!--   证书信息     -->
        <div v-if="typeFlag || memberType === 1 ">
-          <a-divider orientation="left">证书需求</a-divider>
-          <span>申请证书</span>
+          <a-divider orientation="left">绑定证书</a-divider>
+<!--          <span>申请证书</span>-->
          <div v-if="checkFlag||detailFlag">

          </div>
@@ -381,6 +382,7 @@
                <a-select-option value="1">是</a-select-option>
                <a-select-option value="0">否</a-select-option>
              </a-select>
+              <span v-else> — </span>
            </template>
          </a-table>
          <div style="position: relative;top: 20px;" v-if="certificatesNum>0">
@@ -694,13 +696,13 @@ export default {
          payTime: '1/5',
          paymentType: '',
          payNumber: ''
-        },
+        }/*,
        {
          payCategory: '网员服务费',
          payTime: '1',
          paymentType: '',
          payNumber: ''
-        }
+        }*/
      ],
      // 是否是添加功能
      addFlag: false,
@@ -1039,6 +1041,8 @@ export default {
          } else {
            formData.paymentType = 0
          }
+          // 客户要去掉网员服务费字段，但是后端没有去掉校验，所以前端写死
+          formData.serviceCharge = 0
          httpAction(httpurl, formData, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
@@ -1090,6 +1094,8 @@ export default {
          }
          this.model.certificatesNum = this.selectedRowKeys.length
          const formData = Object.assign(this.model, values)
+          // 客户要去掉网员服务费字段，但是后端没有去掉校验，所以前端写死
+          formData.serviceCharge = 0
          if (this.typeFlag) {
            formData.paymentType = 1
          } else {
@@ -1466,4 +1472,8 @@ export default {
 /deep/ .ant-form-item-label {
  width: 145px !important;
 }
+// 会员缴费表格的样式修改，防止缴费年限下拉框被遮挡
+.payment-table{
+  z-index: 10;
+}
 </style>
@@ -27,15 +27,15 @@
          </a-form-item>
        </a-col>
      </a-row>
-      <a-row :span="24" class="label-width-row">
-        <a-col :span="16">
-          <a-form-item label="用户昵称" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
-            <a-input @change="event => event.target.value = event.target.value.trim()"
-                     v-decorator="[ 'realname', validatorRules.realname]" placeholder="请输入用户昵称"
-                     :maxLength="50"></a-input>
-          </a-form-item>
-        </a-col>
-      </a-row>
+<!--      <a-row :span="24" class="label-width-row">-->
+<!--        <a-col :span="16">-->
+<!--          <a-form-item label="用户昵称" :labelCol="labelCol1" :wrapperCol="wrapperCol1">-->
+<!--            <a-input @change="event => event.target.value = event.target.value.trim()"-->
+<!--                     v-decorator="[ 'realname', validatorRules.realname]" placeholder="请输入用户昵称"-->
+<!--                     :maxLength="50"></a-input>-->
+<!--          </a-form-item>-->
+<!--        </a-col>-->
+<!--      </a-row>-->
      <a-row :span="24" class="label-width-row">
        <a-col :span="16">
          <a-form-item label="隶属部门/集团" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
@@ -303,6 +303,8 @@ import { getFileAccessHttpUrl } from '../../../api/memberManage'
 import { DisabledAuthFilterMixin } from '@/mixins/DisabledAuthFilterMixin'
 import ChangeCompanyModal from './modules/ChangeCompanyModal'
 import pick from 'lodash.pick'
+import {phoneReg, isPhone} from '@/utils/validate'
+
 // eslint-disable-next-line no-unused-vars
 import Vue from 'vue'

@@ -618,7 +620,22 @@ export default {
    // 更新变更
    getChangeHistoryData() {

-    }
+    },
+    /*
+   * 验证发票信息-电话号码 的正确性
+   * */
+    handleInvoicePhoneCheck(rule, value, callback) {
+      if (!value) {
+        callback(new Error('请输入电话号码'))
+        return
+      } else {
+        if (phoneReg(value) || isPhone(value)) {
+          callback()
+        } else {
+          callback(new Error('请输入正确格式的电话号码'))
+        }
+      }
+    },
  },
  created() {
    console.log('&&*****会员信息****')
@@ -0,0 +1,81 @@
+<template>
+  <a-card style="width: 100%;height: 100%;text-align: left;">
+    <div class="register-result-content">
+      <result
+        :isSuccess="true"
+        :content="false"
+        :title="email">
+
+        <template slot="action">
+          <a-button size="large" style="margin-left: 8px" @click="goHomeHandle">返回登录页</a-button>
+        </template>
+
+      </result>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import Result from '@/views/result/Result'
+
+export default {
+  name: 'MemberRegisterResult',
+  components: {
+    Result
+  },
+  data() {
+    return {
+      form: {}
+    }
+  },
+  computed: {
+    email() {
+      const v = this.form ? this.form.username || this.form.mobile : ' XXX '
+      // const title = `申请表提交成功，等待标协管理员审核，审核结果将24小时内发送至邮箱。`
+      const title = `感谢您的关注！您的申请已收到，请耐心等待系统审核，24小时内您将收到我们发至预留联系人电子邮箱的邮件，请注意查收！`
+      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      this.username = v
+      return title
+    }
+  },
+  created() {
+    this.form = this.$route.params
+  },
+  methods: {
+    goHomeHandle() {
+      const params = {}
+      params.username = this.form.username
+      params.password = this.form.password
+      this.$router.push({path: '/user/login'})
+      // console.log(params)
+      // this.$router.push({ name: 'login', params })
+      // window.open(`${window._CONFIG['IncomePaymentsLoginUrl']}/user/login`, '_self')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+/deep/ .ant-card {
+  width: 100%;
+  overflow: hidden;
+}
+/deep/ .ant-card-body {
+  padding: 0 !important;
+  height: 100%;
+  background: #F0F2F5;
+}
+.register-result-content{
+  background: #fff;
+  width: calc(100% - 40px);
+  height: calc(100% - 40px);
+  margin: 20px;
+  display: flex;
+  align-items: center;
+  /deep/.result{
+    margin-bottom: 20px;
+    width: 60%;
+  }
+}
+
+</style>