【fix-bug74252】-编辑会议信息，发票不回显的bug； 昨天报名相关问题

src/api/api.js

@@ -124,6 +124,9 @@ const companyAdminResetPassword = (param) => postAction('/payManagerManagement/r
 // 企业管理员启用禁用
 const companyAdminEnable= (param) => postAction('/payManagerManagement/frozenBatch', param)
 
+// 通过企业id查询企业的相关发票信息
+const queryCompanyInfoById= (param) => getAction('/company/payCompanyManagement/queryById', param)
+
 // 加密获取key 与 iv
 const getKeyIv = (param) => getAction('/sys/getEncryptedString',param)
 
@@ -193,7 +196,8 @@ export {
   getContactsByCompanyNoLimit,
   loginIdmPlatform,
   companyAdminResetPassword,
-  companyAdminEnable
+  companyAdminEnable,
+  queryCompanyInfoById
 }
 
 

src/views/incomePayments/meetManage/Attendance.vue

@@ -319,7 +319,7 @@
             <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮 审核报名信息通过后才能审核凭证 审核通过后不显示 审核凭证按钮 -->
           <a @click="handleAudit(record)" v-if="(record.payMode === 1 || record.payMode === 2 ) && record.paymentRecord && record.checkResult !== 1"
              v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证</a>
-            <!-- 只有工作组会议与分标委会议理事会会议才有审核报名信息-->
+            <!-- 只有工作组会议与分标委会议理事会会议 才有审核报名信息-->
           <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>
@@ -327,8 +327,12 @@
           <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>
-          <!--  只有嘉宾才可以设置 -->
-          <a  @click="setGuestsUploadFileFlag(record)" v-show="record.identity === 1" v-has:[authorCode.guestsUploadFileFlag]="'attendance:guestsUploadFileFlag'">资料状态</a>
+          <!--  只有嘉宾才可以设置 且报名信息不需要审核-->
+          <a
+            @click="setGuestsUploadFileFlag(record)"
+            v-show="record.identity === 1 && record.registerCheckResult !== 0"
+            v-has:[authorCode.guestsUploadFileFlag]="'attendance:guestsUploadFileFlag'"
+          >资料状态</a>
         </span>
         </a-table>
       </div>
@@ -954,7 +958,7 @@ export default {
     // 行内 设置嘉宾是否可上传文件，只有参会方式是嘉宾的可以设置
     setGuestsUploadFileFlag(record) {
       // 参会人员不是嘉宾，直接返回
-      if(record.identity !== 1) return
+      if(record.identity !== 1 || record.registerCheckResult === 0) return
       this.$refs.setGuessUploadFlagModal.show(record)
     },
     // 批量设置嘉宾是否可上传文件，只有参会方式是嘉宾的可以设置
@@ -965,10 +969,10 @@ export default {
       }
       // 判断只能身份为嘉宾的数据 设置资料状态
       let flag = this.selectionRows.some(item => {
-        return item.identity !== 1
+        return item.identity !== 1 || item.registerCheckResult === 0
       })
       if(flag) {
-        this.$message.warn('只有身份为嘉宾的数据才可设置资料状态')
+        this.$message.warn('只有身份为嘉宾且报名信息审核通过的数据才可设置资料状态')
         return
       }
       this.$refs.setGuessUploadFlagModal.showBatch(this.selectedRowKeys)

src/views/incomePayments/meetManage/OtherMeetingForm.vue

@@ -547,7 +547,7 @@ export default {
     * */
     changeInvoice(val) {
       this.selectedInvoiceType = Number(val)
-      if (val === '0') {
+      if (this.selectedInvoiceType === 0) {
         // 不需要发票
         this.needInvoiceBool = false
       } else {

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -133,6 +133,7 @@ import { judgeInternalEnterprise } from '../../../api/incomePaymentsApi'
 import {httpAction} from '@api/manage'
 import pick from 'lodash.pick'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import { queryCompanyInfoById } from '../../../api/api'
 
 export default {
   name: 'SignUpInfoEdit',
@@ -287,13 +288,28 @@ export default {
     },
   },
   methods: {
+    // 通过企业的id获取企业管理中的基本信息，用于发票回显
+    queryCompanyInfoById(id) {
+      return new Promise(resolve => {
+        let result = {}
+        queryCompanyInfoById({id}).then(res => {
+          if(res.success) {
+            result = res.result || {}
+            result = pick(res.result, 'companyName', 'dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber')
+          }
+        }).finally(() => {
+          resolve(result)
+        })
+      })
+
+    },
     addContactsOk() {
       this.$refs.selectContacts.getContactsList()
     },
     /*
     * 编辑
     * */
-    edit(record){
+    async edit(record){
       this.isInternalEnterprise = false
       this.form.resetFields()
       this.model = Object.assign({},record)
@@ -310,15 +326,26 @@ export default {
       }
       // 参会人回显
       // this.selectedCompany = this.model.companyId
-      this.selectedCompany = Object.assign({}, this.model.companyId, {
-        //   写入发票的信息，因为需要回显
-        dutyCode:this.model.dutyCode, // 信用代码
-        companyAddress:this.model.companyAddress, // 公司地址
-        companyPhone:this.model.companyPhone, // 公司电话
-        openingBank:this.model.openingBank, // 开户行
-        bankAccount:this.model.bankAccount, // 银行账号
-        linkBankNumber:this.model.linkBankNumber // 联行号
+      // 如果当前的参会人信息中发票信息不全 则从企业管理中获取一下
+      // if(!this.model.dutyCode && !this.model.companyAddress)
+      // 从企业管理中获取全部的会议信息
+      let companyInfo = await this.queryCompanyInfoById(this.model.companyId.id)
+      // 判断当前数据中企业信息是否完整 将有数据的赋值到数据中
+      //   写入发票的信息，因为需要回显
+      //     dutyCode:this.model.dutyCode, // 信用代码
+      //     companyAddress:this.model.companyAddress, // 公司地址
+      //     companyPhone:this.model.companyPhone, // 公司电话
+      //     openingBank:this.model.openingBank, // 开户行
+      //     bankAccount:this.model.bankAccount, // 银行账号
+      //     linkBankNumber:this.model.linkBankNumber // 联行号
+      let invoiceKeys = ['dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber']
+      let invoiceInfo = {}
+      invoiceKeys.map(key => {
+        if(this.model[key]) {
+          invoiceInfo[key] = this.model[key]
+        }
       })
+      this.selectedCompany = Object.assign({}, companyInfo, this.model.companyId, invoiceInfo)
       this.selectPerson = {
         id:this.model.companyContactTemporaryId,
         name:this.model.companyContactName
@@ -444,7 +471,7 @@ export default {
         this.guestType = null
       }
       this.$nextTick( ()=> {
-        this.$refs.formother.setFormVal(this.model)
+        this.$refs.formother.setFormVal(Object.assign({}, this.model, { identify: this.identifyType}))
       })
     },
     /*