【bug】bug修改

src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue

@@ -134,8 +134,12 @@ export default {
     }
   },
   methods: {
-    open(record) {
+   async open(record) {
-      this.getProofInfo(record)
+      let flag = await this.getProofInfo(record)
+     if(!flag){
+       this.$message.warn('项目已审核')
+       return
+     }
       this.form.resetFields()
       let userInfo = Vue.ls.get(USER_INFO)
       // 默认隐藏说明
@@ -187,19 +191,25 @@ export default {
         } else {
           httpMethod = getLastProofInfo
         }
-        httpMethod(param).then(res => {
+        return  new Promise(resolve => {
-          if (res.success) {
+          httpMethod(param).then(res => {
-            this.proofInfo = res.result
+            if (res.success && res.result !== '无数据') {
-            // 标协会员、证书的缴费凭证文件、缴费金额、缴费日期、申请人字段和普通项目、工作组项目、资料网员的不一致
+              this.proofInfo = res.result
-            if (record.projectType.toString() === '5' || record.projectType.toString() === '6') {
+              // 标协会员、证书的缴费凭证文件、缴费金额、缴费日期、申请人字段和普通项目、工作组项目、资料网员的不一致
-              this.proofInfo.proof = res.result.paymentRecord
+              if (record.projectType.toString() === '5' || record.projectType.toString() === '6') {
-              this.proofInfo.amountReceived = res.result.amountReceivable
+                this.proofInfo.proof = res.result.paymentRecord
-              this.proofInfo.paymentDate = res.result.submissionTime
+                this.proofInfo.amountReceived = res.result.amountReceivable
-              this.proofInfo.applicantName = res.result.liaisonMan
+                this.proofInfo.paymentDate = res.result.submissionTime
+                this.proofInfo.applicantName = res.result.liaisonMan
+              }
+              this.getProofType(record)
+              resolve(true)
+            }else{
+              resolve(false)
             }
-            this.getProofType(record)
+          })
-          }
         })
+
       }
     },
     handleOk() {

src/views/incomePayments/meetManage/Attendance.vue

@@ -137,7 +137,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24"
                    v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' || currentMeetingInfo.meetingType === '6' ">
               <a-form-item label="审核报名信息">
-                <j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择"
+                <j-dict-select-tag v-model="queryParam.registerCheckResult" placeholder="请选择"
                                    dictCode="signup_status"/>
               </a-form-item>
             </a-col>
@@ -261,7 +261,8 @@
           <a @click="handleAuditSignUp(record)"
              v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' || currentMeetingInfo.meetingType === '6') && record.registerCheckResult === 0 "
              v-has:[authorCode.auditSignUpInfo]="'attendance:auditSignUp'">审核报名信息</a>
-          <a @click="handleEdit(record)" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
+<!--            非成员报名被拒绝 无法编辑 -->
+          <a @click="handleEdit(record)" v-if="record.registerCheckResult !== 2" v-has:[authorCode.edit]="'attendance:edit'">编辑</a>
             <!--删除参会人需要判断改参会人是否与合同关联-->
           <a @click="handleDelete(record.id)" v-has:[authorCode.delete]="'attendance:delete'">删除</a>
         </span>
@@ -445,7 +446,7 @@ export default {
         export: 'workGroupMeetingSituation:export',
         batchDel: 'workGroupMeetingSituation:batchDel',
         edit: 'workGroupMeetingSituation:edit',
-        delete: 'workGroupMeetingSituationS:delete',
+        delete: 'workGroupMeetingSituation:delete',
         auditRecord: 'workGroupMeetingSituation:auditCredentials',
         auditSignUpInfo: 'workGroupMeetingSituation:auditSignUp'
       },