diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index e949df4..00f4fe4 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -115,9 +115,9 @@
             <a href="javascript:;"
                @click="(record.certificateModality == 3 && (record.certificateStatus == 1 || record.certificateStatus == 4)) && replacement(record)">换证</a>
           </a>
-          <a v-show="$store.getters.userInfo.roleCode !== '3' && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0">
+          <a v-show="($store.getters.userInfo.roleCode !== '3' && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) &&  record.paymentStatus !== 4">
             <a href="javascript:;"
-               @click="((record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) && handleEditRenew(record) && $store.getters.userInfo.roleCode !== '3'">编辑</a>
+               @click="((record.certificateStatus == 6 && record.chargeType == 2 && record.paymentStatus !== 4) || record.certificateStatus == 0) && handleEditRenew(record) && $store.getters.userInfo.roleCode !== '3'">编辑</a>
           </a>
             <!--         会员 只有企业证书才 正常使用 已绑定的证书 可授权申请-->
           <a
diff --git a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
index 0a88485..c3654d3 100644
--- a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
@@ -100,12 +100,15 @@
           <span slot="action" class="action-span-cell" slot-scope="text, record">
 <!--          <a v-has="'certificate:paymentinfo:check'" v-show="record.paymentStatus==1" @click="(record.paymentStatus==1) && handleCheck(record)">核对凭证</a>-->
           <a @click="handleDetail(record)">查看</a>
+            <!--  待上传的并且没有上传缴费凭证可以上传凭证 -->
+              <a v-if="record.paymentStatus === 4 && !record.paymentRecord" href="javascript:;" @click="handleUploadRecord(record)">上传凭证</a>
         </span>
 
         </a-table>
       </div>
 
       <certificatePaymentInfo-modal ref="modalForm" @ok="modalFormOk"></certificatePaymentInfo-modal>
+      <upload-record-modal upload-type="1" ref="uploadRecord" @ok="modalFormOk"></upload-record-modal>
     </a-card>
   </div>
 </template>
@@ -115,6 +118,7 @@ import '@/assets/less/TableExpand.less'
 import { mixinDevice } from '@/utils/mixin'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import CertificatePaymentInfoModal from './modules/CertificatePaymentInfoModal'
+import UploadRecordModal from '@views/standardsAssociation/PaymentInfo/modules/UploadRecordModal'
 import JDictSelectTag from '@/components/standardsAssociation/JDictSelectTag.vue'
 import JDate from '@/components/tools/JDate.vue'
 import { getMemberInfoById } from '@/api/standardsAssociationApi'
@@ -125,6 +129,7 @@ export default {
   name: 'CertificateInfo',
   mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
   components: {
+    UploadRecordModal,
     JDictSelectTag,
     JDate,
     CertificatePaymentInfoModal
@@ -170,6 +175,12 @@ export default {
   methods: {
     initDictConfig() {
     },
+    /**
+     * 上传凭证
+     * */
+    handleUploadRecord(record) {
+      this.$refs.uploadRecord.open(record)
+    },
     // 核对凭证
     handleCheck: function(record) {
       this.$refs.modalForm.handleCheck(record)
diff --git a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
index 201bea1..42df172 100644
--- a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
@@ -141,7 +141,7 @@
       <!--组合缴费 -->
 
       <!--      企业端上传 缴费凭证-->
-      <upload-record-modal ref="uploadRecord" @ok="modalFormOk"></upload-record-modal>
+      <upload-record-modal upload-type="2" ref="uploadRecord" @ok="modalFormOk"></upload-record-modal>
       <!--      企业端上传 缴费凭证-->
     </a-card>
   </div>
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/UploadRecordModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/UploadRecordModal.vue
index 9a8d825..5da11f4 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/UploadRecordModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/UploadRecordModal.vue
@@ -32,6 +32,27 @@ export default {
   components: {
     JImageUpload
   },
+  props:{
+    // 会员缴费的上传 还是证书缴费的上传 1是证书 2是会费
+    uploadType:{
+      type:String,
+      required:false
+    }
+  },
+  computed:{
+    // eslint-disable-next-line
+    url(){
+      if(this.uploadType === '1'){
+        return  {
+          add:'/certificatePaymentInfo/uploadPaymentRecord'
+        }
+      }else if(this.uploadType === '2'){
+        return  {
+          add:'/paymentInfo/uploadPaymentRecord'
+        }
+      }
+    }
+  },
   data() {
     return {
       visible: false,
@@ -58,9 +79,6 @@ export default {
           validateTrigger: ['blur', 'change']
         },
       },
-      url: {
-        add: '/paymentInfo/uploadPaymentRecord'
-      }
     }
   },
   methods: {